[src/trunk]: src/external/apache2/llvm Use a big hammer and disabling strict ...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7521d6a16496
branches:  trunk
changeset: 966860:7521d6a16496
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon Nov 18 19:54:23 2019 +0000

description:
Use a big hammer and disabling strict aliasing for the tools build or
when using GCC.

diffstat:

 external/apache2/llvm/Makefile.inc             |  6 +++---
 external/apache2/llvm/lib/libclangAST/Makefile |  6 +-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diffs (47 lines):

diff -r 95ae3991625a -r 7521d6a16496 external/apache2/llvm/Makefile.inc
--- a/external/apache2/llvm/Makefile.inc        Mon Nov 18 16:23:28 2019 +0000
+++ b/external/apache2/llvm/Makefile.inc        Mon Nov 18 19:54:23 2019 +0000
@@ -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 @@
 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_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}
diff -r 95ae3991625a -r 7521d6a16496 external/apache2/llvm/lib/libclangAST/Makefile
--- a/external/apache2/llvm/lib/libclangAST/Makefile    Mon Nov 18 16:23:28 2019 +0000
+++ b/external/apache2/llvm/lib/libclangAST/Makefile    Mon Nov 18 19:54:23 2019 +0000
@@ -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 @@
 
 .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