Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk Structure HAVE_LIBGCC condition similar to HAVE_LIB...



details:   https://anonhg.NetBSD.org/src/rev/4a4443219da9
branches:  trunk
changeset: 329283:4a4443219da9
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat May 17 23:31:57 2014 +0000

description:
Structure HAVE_LIBGCC condition similar to HAVE_LIBGCC_EH.

diffstat:

 share/mk/bsd.own.mk |  15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diffs (34 lines):

diff -r 26e31f58b8e7 -r 4a4443219da9 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sat May 17 23:30:24 2014 +0000
+++ b/share/mk/bsd.own.mk       Sat May 17 23:31:57 2014 +0000
@@ -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 @@
 
 .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



Home | Main Index | Thread Index | Old Index