Module Name: src
Committed By: joerg
Date: Mon Nov 18 19:54:24 UTC 2019
Modified Files:
src/external/apache2/llvm: Makefile.inc
src/external/apache2/llvm/lib/libclangAST: Makefile
Log Message:
Use a big hammer and disabling strict aliasing for the tools build or
when using GCC.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/apache2/llvm/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/apache2/llvm/lib/libclangAST/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/apache2/llvm/Makefile.inc
diff -u src/external/apache2/llvm/Makefile.inc:1.2 src/external/apache2/llvm/Makefile.inc:1.3
--- src/external/apache2/llvm/Makefile.inc:1.2 Thu Nov 14 13:16:35 2019
+++ src/external/apache2/llvm/Makefile.inc Mon Nov 18 19:54:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2019/11/14 13:16:35 martin Exp $
+# $NetBSD: Makefile.inc,v 1.3 2019/11/18 19:54:23 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
@@ -28,7 +28,7 @@ CLANG_INCLUDE_CONFIG= ${LLVM_TOOLCONF_OB
LLVM_INCLUDE_OBJDIR!= cd ${NETBSDSRCDIR}/tools/llvm-include && ${PRINTOBJDIR}
LLVM_TOOLCONF_OBJDIR!= cd ${NETBSDSRCDIR}/tools/llvm && ${PRINTOBJDIR}
HOST_CPPFLAGS+= ${CPPFLAGS}
-HOST_CXXFLAGS+= -O2 -fno-rtti -fno-exceptions
+HOST_CXXFLAGS+= -O2 -fno-rtti -fno-exceptions
HOST_CPPFLAGS+= -std=c++14
LLVM_TARGETS= x86,powerpc,sparc,aarch64,arm,mips
.else
@@ -38,7 +38,7 @@ LLVM_INCLUDE_OBJDIR!= cd ${LLVM_TOPLEVEL
LLVM_TARGETS= x86,powerpc,sparc,aarch64,arm,mips,amdgpu
CXXFLAGS+= -std=c++14
-CXXFLAGS+= -fno-rtti -fno-exceptions
+CXXFLAGS+= -fno-rtti -fno-exceptions ${${ACTIVE_CC} == "gcc" :? -fno-strict-aliasing :}
CXXFLAGS+= -ffunction-sections -fdata-sections
LDFLAGS+= -Wl,--gc-sections
DPADD+= ${LIBEXECINFO}
Index: src/external/apache2/llvm/lib/libclangAST/Makefile
diff -u src/external/apache2/llvm/lib/libclangAST/Makefile:1.2 src/external/apache2/llvm/lib/libclangAST/Makefile:1.3
--- src/external/apache2/llvm/lib/libclangAST/Makefile:1.2 Sat Nov 16 15:51:26 2019
+++ src/external/apache2/llvm/lib/libclangAST/Makefile Mon Nov 18 19:54:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/11/16 15:51:26 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/18 19:54:23 joerg Exp $
LIB= clangAST
@@ -112,10 +112,6 @@ CLANG_TABLEGEN_OUTPUT= \
.if defined(HOSTLIB)
.include <bsd.hostlib.mk>
-BAD_GCC_VERSION!= case `${HOST_CXX} --version 2> /dev/null` in [cg]++*7.4*) echo yes ;; *) echo no ;; esac
-. if ${BAD_GCC_VERSION} == "yes"
-HOST_CXXFLAGS+= -O0
-. endif
.else
.include <bsd.lib.mk>
.endif
