Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/llvm/include also fix up LLVM_HOST_TRIPLE.
details: https://anonhg.NetBSD.org/src/rev/535ecf2beb45
branches: trunk
changeset: 457022:535ecf2beb45
user: mrg <mrg%NetBSD.org@localhost>
date: Fri Jun 07 05:22:28 2019 +0000
description:
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.
diffstat:
external/bsd/llvm/include/Makefile | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diffs (45 lines):
diff -r d9d1954a4008 -r 535ecf2beb45 external/bsd/llvm/include/Makefile
--- a/external/bsd/llvm/include/Makefile Fri Jun 07 04:39:15 2019 +0000
+++ b/external/bsd/llvm/include/Makefile Fri Jun 07 05:22:28 2019 +0000
@@ -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 @@
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/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
Home |
Main Index |
Thread Index |
Old Index