[src/trunk]: src Use a separate variable for the use of GCC's unwind code.

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

details:   https://anonhg.NetBSD.org/src/rev/34dd8b1c908e
branches:  trunk
changeset: 326092:34dd8b1c908e
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat Jan 18 01:08:56 2014 +0000

description:
Use a separate variable for the use of GCC's unwind code.

diffstat:

 lib/libc/Makefile                 |  4 ++--
 lib/libc/compiler_rt/Makefile.inc |  5 ++---
 share/mk/bsd.own.mk               |  8 +++++++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diffs (59 lines):

diff -r eb2c5241ec19 -r 34dd8b1c908e lib/libc/Makefile
--- a/lib/libc/Makefile Fri Jan 17 22:34:36 2014 +0000
+++ b/lib/libc/Makefile Sat Jan 18 01:08:56 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.161 2014/01/15 20:58:09 joerg Exp $
+#      $NetBSD: Makefile,v 1.162 2014/01/18 01:08:56 joerg Exp $
 #      @(#)Makefile    8.2 (Berkeley) 2/3/94
 #
 # All library objects contain sccsid strings by default; they may be
@@ -99,7 +99,7 @@
 .include "${.CURDIR}/time/Makefile.inc"
 .include "${.CURDIR}/tls/Makefile.inc"
 .include "${.CURDIR}/sys/Makefile.inc"
-.if ${HAVE_LIBGCC} == "no"
+.if ${HAVE_LIBGCC_EH} == "no"
 .include "${NETBSDSRCDIR}/sys/lib/libunwind/Makefile.inc"
 .endif
 .include "${.CURDIR}/uuid/Makefile.inc"
diff -r eb2c5241ec19 -r 34dd8b1c908e lib/libc/compiler_rt/Makefile.inc
--- a/lib/libc/compiler_rt/Makefile.inc Fri Jan 17 22:34:36 2014 +0000
+++ b/lib/libc/compiler_rt/Makefile.inc Sat Jan 18 01:08:56 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2014/01/17 14:08:59 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.10 2014/01/18 01:08:56 joerg Exp $
 
 COMPILER_RT_SRCDIR=    ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
 
@@ -28,8 +28,7 @@
 GENERIC_SRCS+= atomic.c
 .endif
 
-.if ${LIBC_MACHINE_ARCH} == "i386" || ${LIBC_MACHINE_ARCH} == "amd64"
-# Requires unwind support
+.if ${HAVE_LIBGCC_EH} == "no"
 GENERIC_SRCS+= \
        gcc_personality_v0.c
 .endif
diff -r eb2c5241ec19 -r 34dd8b1c908e share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Fri Jan 17 22:34:36 2014 +0000
+++ b/share/mk/bsd.own.mk       Sat Jan 18 01:08:56 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.762 2014/01/16 01:19:46 christos Exp $
+#      $NetBSD: bsd.own.mk,v 1.763 2014/01/18 01:08:56 joerg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -71,6 +71,12 @@
 HAVE_LIBGCC?=  yes
 .endif
 
+.if ${MKLLVM:Uno} == "yes" && (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
+HAVE_LIBGCC_EH?=       no
+.else
+HAVE_LIBGCC_EH?=       yes
+.endif
+
 HAVE_GDB?=     7
 
 .if (${MACHINE_ARCH} == "alpha") || \