Module Name: src
Committed By: joerg
Date: Sat Jan 18 01:08:56 UTC 2014
Modified Files:
src/lib/libc: Makefile
src/lib/libc/compiler_rt: Makefile.inc
src/share/mk: bsd.own.mk
Log Message:
Use a separate variable for the use of GCC's unwind code.
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/lib/libc/Makefile
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/compiler_rt/Makefile.inc
cvs rdiff -u -r1.762 -r1.763 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/Makefile
diff -u src/lib/libc/Makefile:1.161 src/lib/libc/Makefile:1.162
--- src/lib/libc/Makefile:1.161 Wed Jan 15 20:58:09 2014
+++ src/lib/libc/Makefile Sat Jan 18 01:08:56 2014
@@ -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 @@ CPPFLAGS+= -D__BUILD_LEGACY
.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"
Index: src/lib/libc/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.9 src/lib/libc/compiler_rt/Makefile.inc:1.10
--- src/lib/libc/compiler_rt/Makefile.inc:1.9 Fri Jan 17 14:08:59 2014
+++ src/lib/libc/compiler_rt/Makefile.inc Sat Jan 18 01:08:56 2014
@@ -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 @@ COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCD
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
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.762 src/share/mk/bsd.own.mk:1.763
--- src/share/mk/bsd.own.mk:1.762 Thu Jan 16 01:19:46 2014
+++ src/share/mk/bsd.own.mk Sat Jan 18 01:08:56 2014
@@ -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?= no
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") || \
