Module Name: src
Committed By: joerg
Date: Sat May 17 23:31:57 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Structure HAVE_LIBGCC condition similar to HAVE_LIBGCC_EH.
To generate a diff of this commit:
cvs rdiff -u -r1.804 -r1.805 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/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.804 src/share/mk/bsd.own.mk:1.805
--- src/share/mk/bsd.own.mk:1.804 Fri May 16 00:19:00 2014
+++ src/share/mk/bsd.own.mk Sat May 17 23:31:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.804 2014/05/16 00:19:00 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.805 2014/05/17 23:31:57 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -87,16 +87,19 @@ EXTERNAL_GCC_SUBDIR= /does/not/exist
.endif
-.if ${MKLLVM:Uno} == "yes" && (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
+.if !empty(MACHINE_ARCH:Mearm*)
+_LIBC_UNWIND_SUPPORT.${MACHINE_ARCH}= yes
+.endif
+
+_LIBC_COMPILER_RT.i386= yes
+_LIBC_COMPILER_RT.x86_64= yes
+
+.if ${MKLLVM:Uno} == "yes" && ${_LIBC_COMPILER_RT.${MACHINE_ARCH}:Uno} == "yes"
HAVE_LIBGCC?= no
.else
HAVE_LIBGCC?= yes
.endif
-.if !empty(MACHINE_ARCH:Mearm*)
-_LIBC_UNWIND_SUPPORT.${MACHINE_ARCH}= yes
-.endif
-
_LIBC_UNWIND_SUPPORT.alpha= yes
_LIBC_UNWIND_SUPPORT.hppa= yes
_LIBC_UNWIND_SUPPORT.i386= yes
