[src/trunk]: src Rename USE_LIBGCC to HAVE_LIBGCC and retry using it as flag ...

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

details:   https://anonhg.NetBSD.org/src/rev/6f3c20811db7
branches:  trunk
changeset: 790483:6f3c20811db7
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon Oct 14 16:00:16 2013 +0000

description:
Rename USE_LIBGCC to HAVE_LIBGCC and retry using it as flag on unwind.h.

diffstat:

 distrib/sets/lists/comp/mi |  4 ++--
 distrib/sets/mkvars.mk     |  3 ++-
 distrib/sets/sets.subr     |  6 +++---
 lib/libc/Makefile          |  8 ++++----
 share/mk/bsd.lib.mk        |  4 ++--
 share/mk/bsd.own.mk        |  6 +++---
 6 files changed, 16 insertions(+), 15 deletions(-)

diffs (136 lines):

diff -r 973386fad476 -r 6f3c20811db7 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Mon Oct 14 12:20:05 2013 +0000
+++ b/distrib/sets/lists/comp/mi        Mon Oct 14 16:00:16 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mi,v 1.1843 2013/10/14 11:11:13 joerg Exp $
+#      $NetBSD: mi,v 1.1844 2013/10/14 16:00:16 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2779,7 +2779,7 @@
 ./usr/include/ulimit.h                         comp-c-include
 ./usr/include/unctrl.h                         comp-c-include
 ./usr/include/unistd.h                         comp-c-include
-./usr/include/unwind.h                         comp-c-include          nolibgcc
+./usr/include/unwind.h                         comp-c-include          !libgcc
 ./usr/include/usb.h                            comp-obsolete           obsolete
 ./usr/include/usbhid.h                         comp-c-include
 ./usr/include/util.h                           comp-c-include
diff -r 973386fad476 -r 6f3c20811db7 distrib/sets/mkvars.mk
--- a/distrib/sets/mkvars.mk    Mon Oct 14 12:20:05 2013 +0000
+++ b/distrib/sets/mkvars.mk    Mon Oct 14 16:00:16 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.12 2013/06/12 21:35:29 mrg Exp $
+# $NetBSD: mkvars.mk,v 1.13 2013/10/14 16:00:16 joerg Exp $
 
 MKEXTRAVARS= \
        MACHINE \
@@ -6,6 +6,7 @@
        MACHINE_CPU \
        HAVE_GCC \
        HAVE_GDB \
+       HAVE_LIBGCC \
        HAVE_SSP \
        OBJECT_FMT \
        TOOLCHAIN_MISSING \
diff -r 973386fad476 -r 6f3c20811db7 distrib/sets/sets.subr
--- a/distrib/sets/sets.subr    Mon Oct 14 12:20:05 2013 +0000
+++ b/distrib/sets/sets.subr    Mon Oct 14 16:00:16 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sets.subr,v 1.155 2013/10/14 11:11:13 joerg Exp $
+#      $NetBSD: sets.subr,v 1.156 2013/10/14 16:00:16 joerg Exp $
 #
 
 #
@@ -179,7 +179,7 @@
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
 #
-#      # $NetBSD: sets.subr,v 1.155 2013/10/14 11:11:13 joerg Exp $
+#      # $NetBSD: sets.subr,v 1.156 2013/10/14 16:00:16 joerg Exp $
 #      .                       base-sys-root   [keyword[,...]]
 #      ./altroot               base-sys-root
 #      ./bin                   base-sys-root
@@ -229,7 +229,7 @@
 #      ldap                    ${MKLDAP} != no
 #      lint                    ${MKLINT} != no
 #      libcxx                  ${MKLIBCXX} != no
-#      nolibgcc                ${USE_LIBGCC} == no
+#      libgcc                  ${HAVE_LIBGCC} != no
 #      libstdcxx               ${MKLIBSTDCXX} != no
 #      lld                     ${MKLLD} != no
 #      lldb                    ${MKLLDB} != no
diff -r 973386fad476 -r 6f3c20811db7 lib/libc/Makefile
--- a/lib/libc/Makefile Mon Oct 14 12:20:05 2013 +0000
+++ b/lib/libc/Makefile Mon Oct 14 16:00:16 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.159 2013/10/14 01:30:21 joerg Exp $
+#      $NetBSD: Makefile,v 1.160 2013/10/14 16:00:17 joerg Exp $
 #      @(#)Makefile    8.2 (Berkeley) 2/3/94
 #
 # All library objects contain sccsid strings by default; they may be
@@ -63,7 +63,7 @@
 .include "${.CURDIR}/db/Makefile.inc"
 .include "${.CURDIR}/citrus/Makefile.inc"
 .include "${.CURDIR}/compat-43/Makefile.inc"
-.if ${USE_LIBGCC} == "no"
+.if ${HAVE_LIBGCC} == "no"
 .include "${.CURDIR}/compiler_rt/Makefile.inc"
 .endif
 .include "${.CURDIR}/dlfcn/Makefile.inc"
@@ -99,7 +99,7 @@
 .include "${.CURDIR}/time/Makefile.inc"
 .include "${.CURDIR}/tls/Makefile.inc"
 .include "${.CURDIR}/sys/Makefile.inc"
-.if ${USE_LIBGCC} == "no"
+.if ${HAVE_LIBGCC} == "no"
 .include "${NETBSDSRCDIR}/sys/lib/libunwind/Makefile.inc"
 .endif
 .include "${.CURDIR}/uuid/Makefile.inc"
@@ -152,6 +152,6 @@
 
 # force the dynamic linker to initialize libc first
 SHLIB_SHFLAGS+=        -Wl,-z,initfirst
-.if ${USE_LIBGCC} == "no"
+.if ${HAVE_LIBGCC} == "no"
 SHLIB_SHFLAGS+= -Wl,-z,defs
 .endif
diff -r 973386fad476 -r 6f3c20811db7 share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk       Mon Oct 14 12:20:05 2013 +0000
+++ b/share/mk/bsd.lib.mk       Mon Oct 14 16:00:16 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.lib.mk,v 1.340 2013/10/14 01:30:21 joerg Exp $
+#      $NetBSD: bsd.lib.mk,v 1.341 2013/10/14 16:00:16 joerg Exp $
 #      @(#)bsd.lib.mk  8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
@@ -589,7 +589,7 @@
 .endif
 .else
 LDLIBC ?= -nodefaultlibs
-.if ${USE_LIBGCC} == "yes" && ${LIB} == "c"
+.if ${HAVE_LIBGCC} == "yes" && ${LIB} == "c"
 LDADD+= -lgcc
 .endif
 .endif
diff -r 973386fad476 -r 6f3c20811db7 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Mon Oct 14 12:20:05 2013 +0000
+++ b/share/mk/bsd.own.mk       Mon Oct 14 16:00:16 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.752 2013/10/14 01:30:21 joerg Exp $
+#      $NetBSD: bsd.own.mk,v 1.753 2013/10/14 16:00:16 joerg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -66,9 +66,9 @@
 .endif
 
 .if ${MKLLVM:Uno} == "yes" && (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
-USE_LIBGCC?=   no
+HAVE_LIBGCC?=  no
 .else
-USE_LIBGCC?=   yes
+HAVE_LIBGCC?=  yes
 .endif
 
 HAVE_GDB?=     7