diff options
| author | joerg <joerg@NetBSD.org> | 2014-01-18 01:08:56 +0000 |
|---|---|---|
| committer | joerg <joerg@NetBSD.org> | 2014-01-18 01:08:56 +0000 |
| commit | 735edc45bc8a806d71fbd57dec790e39dbfbbc93 (patch) | |
| tree | c3d3bbe3d7b9e23909da906d7fffc9069bd6667b | |
| parent | d0711b69b0674cd6fcb544d7a79a72e8d607fb0d (diff) | |
Use a separate variable for the use of GCC's unwind code.
| -rw-r--r-- | lib/libc/Makefile | 4 | ||||
| -rw-r--r-- | lib/libc/compiler_rt/Makefile.inc | 5 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 8 |
3 files changed, 11 insertions, 6 deletions
diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 981533cdaa0..cda067a6fee 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -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" diff --git a/lib/libc/compiler_rt/Makefile.inc b/lib/libc/compiler_rt/Makefile.inc index 69d63a8876e..888e1e37a45 100644 --- a/lib/libc/compiler_rt/Makefile.inc +++ b/lib/libc/compiler_rt/Makefile.inc @@ -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_SRCDIR}/lib/${MACHINE_ARCH} 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 --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index f71ba83cc70..4e3ccc49d1c 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -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") || \ |
