From e235cd7c283cb37f7fc50dd325838d75441de257 Mon Sep 17 00:00:00 2001 From: mrg Date: Fri, 7 Jun 2019 05:22:28 +0000 Subject: [PATCH] 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. --- external/bsd/llvm/include/Makefile | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/external/bsd/llvm/include/Makefile b/external/bsd/llvm/include/Makefile index b3ddaa19b38e..2be05271446b 100644 --- a/external/bsd/llvm/include/Makefile +++ b/external/bsd/llvm/include/Makefile @@ -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 @@ -294,11 +294,15 @@ NATIVE_LLVM_TARGETMC= LLVMInitialize${NATIVE_LLVM_ARCH}TargetMC 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}/Makefile.inc ${LLVM_TOPLEVEL}/config/llvm 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