Module Name: src
Committed By: joerg
Date: Mon Oct 14 16:00:17 UTC 2013
Modified Files:
src/distrib/sets: mkvars.mk sets.subr
src/distrib/sets/lists/comp: mi
src/lib/libc: Makefile
src/share/mk: bsd.lib.mk bsd.own.mk
Log Message:
Rename USE_LIBGCC to HAVE_LIBGCC and retry using it as flag on unwind.h.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.155 -r1.156 src/distrib/sets/sets.subr
cvs rdiff -u -r1.1843 -r1.1844 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.159 -r1.160 src/lib/libc/Makefile
cvs rdiff -u -r1.340 -r1.341 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.752 -r1.753 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/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.12 src/distrib/sets/mkvars.mk:1.13
--- src/distrib/sets/mkvars.mk:1.12 Wed Jun 12 21:35:29 2013
+++ src/distrib/sets/mkvars.mk Mon Oct 14 16:00:16 2013
@@ -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 @@ MKEXTRAVARS= \
MACHINE_CPU \
HAVE_GCC \
HAVE_GDB \
+ HAVE_LIBGCC \
HAVE_SSP \
OBJECT_FMT \
TOOLCHAIN_MISSING \
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.155 src/distrib/sets/sets.subr:1.156
--- src/distrib/sets/sets.subr:1.155 Mon Oct 14 11:11:13 2013
+++ src/distrib/sets/sets.subr Mon Oct 14 16:00:16 2013
@@ -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 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# 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 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# 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
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1843 src/distrib/sets/lists/comp/mi:1.1844
--- src/distrib/sets/lists/comp/mi:1.1843 Mon Oct 14 11:11:13 2013
+++ src/distrib/sets/lists/comp/mi Mon Oct 14 16:00:16 2013
@@ -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
Index: src/lib/libc/Makefile
diff -u src/lib/libc/Makefile:1.159 src/lib/libc/Makefile:1.160
--- src/lib/libc/Makefile:1.159 Mon Oct 14 01:30:21 2013
+++ src/lib/libc/Makefile Mon Oct 14 16:00:17 2013
@@ -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 @@ CPPFLAGS+= -D__BUILD_LEGACY
.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 @@ CPPFLAGS+= -D__BUILD_LEGACY
.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 @@ CSHLIBFLAGS+= -D_I18N_DYNAMIC
# 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
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.340 src/share/mk/bsd.lib.mk:1.341
--- src/share/mk/bsd.lib.mk:1.340 Mon Oct 14 01:30:21 2013
+++ src/share/mk/bsd.lib.mk Mon Oct 14 16:00:16 2013
@@ -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 @@ DPLIBC ?= ${DESTDIR}${LIBC_SO}
.endif
.else
LDLIBC ?= -nodefaultlibs
-.if ${USE_LIBGCC} == "yes" && ${LIB} == "c"
+.if ${HAVE_LIBGCC} == "yes" && ${LIB} == "c"
LDADD+= -lgcc
.endif
.endif
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.752 src/share/mk/bsd.own.mk:1.753
--- src/share/mk/bsd.own.mk:1.752 Mon Oct 14 01:30:21 2013
+++ src/share/mk/bsd.own.mk Mon Oct 14 16:00:16 2013
@@ -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 @@ USE_COMPILERCRTSTUFF?= no
.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
