Module Name: src
Committed By: mrg
Date: Fri Jun 7 05:22:28 UTC 2019
Modified Files:
src/external/bsd/llvm/include: Makefile
Log Message:
also fix up LLVM_HOST_TRIPLE.
previously, this was attempting to emit x86 code on arm.
thanks joerg@ for pointing me in the right place.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/external/bsd/llvm/include/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/llvm/include/Makefile
diff -u src/external/bsd/llvm/include/Makefile:1.49 src/external/bsd/llvm/include/Makefile:1.50
--- src/external/bsd/llvm/include/Makefile:1.49 Wed Apr 3 15:21:58 2019
+++ src/external/bsd/llvm/include/Makefile Fri Jun 7 05:22:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2019/04/03 15:21:58 joerg Exp $
+# $NetBSD: Makefile,v 1.50 2019/06/07 05:22:28 mrg Exp $
.include <bsd.init.mk>
@@ -294,11 +294,15 @@ NATIVE_LLVM_TARGETMC= LLVMInitialize${N
llvm/Config/config.h: ${LLVM_TOPLEVEL}/Makefile.inc ${LLVM_TOPLEVEL}/config/llvm/Config/config.h.in
mkdir -p ${.TARGET:H}
- ${TOOL_SED} -e /LLVM_DEFAULT_TARGET_TRIPLE/d -e /LLVM_NATIVE_/d \
- -e /LLVM_VERSION_/d -e /PACKAGE_VERSION/d -e 'x' \
+ ${TOOL_SED} -e /LLVM_DEFAULT_TARGET_TRIPLE/d \
+ -e /LLVM_HOST_TRIPLE/d \
+ -e /LLVM_NATIVE_/d \
+ -e /LLVM_VERSION_/d \
+ -e /PACKAGE_VERSION/d -e 'x' \
< ${LLVM_TOPLEVEL}/config/llvm/Config/config.h.in \
> ${.TARGET}.tmp
printf '#define LLVM_DEFAULT_TARGET_TRIPLE "${MACHINE_GNU_PLATFORM}"\n' >> ${.TARGET}.tmp
+ printf '#define LLVM_HOST_TRIPLE "${MACHINE_GNU_PLATFORM}"\n' >> ${.TARGET}.tmp
.if defined(NATIVE_LLVM_ARCH)
printf '#define LLVM_NATIVE_ARCH ${NATIVE_LLVM_ARCH}\n' >> ${.TARGET}.tmp
printf '#define LLVM_NATIVE_ASMPARSER ${NATIVE_LLVM_ASMPARSER}\n' >> ${.TARGET}.tmp
@@ -318,11 +322,15 @@ llvm/Config/config.h: ${LLVM_TOPLEVEL}/M
llvm/Config/llvm-config.h: ${LLVM_TOPLEVEL}/Makefile.inc ${LLVM_TOPLEVEL}/config/llvm/Config/llvm-config.h.in
mkdir -p ${.TARGET:H}
- ${TOOL_SED} -e /LLVM_DEFAULT_TARGET_TRIPLE/d -e /LLVM_NATIVE_/d \
- -e /LLVM_VERSION_/d -e /PACKAGE_VERSION/d -e 'x' \
+ ${TOOL_SED} -e /LLVM_DEFAULT_TARGET_TRIPLE/d \
+ -e /LLVM_HOST_TRIPLE/d \
+ -e /LLVM_NATIVE_/d \
+ -e /LLVM_VERSION_/d \
+ -e /PACKAGE_VERSION/d -e 'x' \
< ${LLVM_TOPLEVEL}/config/llvm/Config/llvm-config.h.in \
> ${.TARGET}.tmp
printf '#define LLVM_DEFAULT_TARGET_TRIPLE "${MACHINE_GNU_PLATFORM}"\n' >> ${.TARGET}.tmp
+ printf '#define LLVM_HOST_TRIPLE "${MACHINE_GNU_PLATFORM}"\n' >> ${.TARGET}.tmp
.if defined(NATIVE_LLVM_ARCH)
printf '#define LLVM_NATIVE_ARCH ${NATIVE_LLVM_ARCH}\n' >> ${.TARGET}.tmp
printf '#define LLVM_NATIVE_ASMPARSER ${NATIVE_LLVM_ASMPARSER}\n' >> ${.TARGET}.tmp
