Module Name: src
Committed By: mrg
Date: Fri Oct 7 09:15:22 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64
md.sparc64 shl.mi
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
src/external/gpl3/gcc/lib/libgcc/libgcc_eh: Makefile
src/libexec/ld.elf_so: Makefile
src/share/mk: bsd.hostprog.mk bsd.lib.mk
Log Message:
obsolete libgcc_pic and friends. all libgcc's are supposed to be pic
for platforms with shlibs already (and are.)
this obsoletes our hacks for the libgcc specs to use libgcc_pic, and
fixes a couple of other issues reported to me directly.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/distrib/sets/lists/comp/ad.mips64eb \
src/distrib/sets/lists/comp/ad.mips64el
cvs rdiff -u -r1.140 -r1.141 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.125 -r1.126 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.194 -r1.195 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile
cvs rdiff -u -r1.109 -r1.110 src/libexec/ld.elf_so/Makefile
cvs rdiff -u -r1.64 -r1.65 src/share/mk/bsd.hostprog.mk
cvs rdiff -u -r1.317 -r1.318 src/share/mk/bsd.lib.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/lists/comp/ad.mips64eb
diff -u src/distrib/sets/lists/comp/ad.mips64eb:1.56 src/distrib/sets/lists/comp/ad.mips64eb:1.57
--- src/distrib/sets/lists/comp/ad.mips64eb:1.56 Sun Sep 25 04:11:47 2011
+++ src/distrib/sets/lists/comp/ad.mips64eb Fri Oct 7 09:15:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.56 2011/09/25 04:11:47 christos Exp $
+# $NetBSD: ad.mips64eb,v 1.57 2011/10/07 09:15:21 mrg Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45
@@ -276,9 +276,9 @@
./usr/lib/64/libgcc.a comp-c-lib compat
./usr/lib/64/libgcc_eh.a comp-c-lib compat,pic
./usr/lib/64/libgcc_eh_p.a comp-c-proflib compat,profile,pic
-./usr/lib/64/libgcc_eh_pic.a comp-c-piclib compat,pic
+./usr/lib/64/libgcc_eh_pic.a comp-c-piclib obsolete
./usr/lib/64/libgcc_p.a comp-c-proflib compat,profile
-./usr/lib/64/libgcc_pic.a comp-c-piclib compat,pic
+./usr/lib/64/libgcc_pic.a comp-c-piclib obsolete
./usr/lib/64/libgcc_s.a comp-obsolete obsolete
./usr/lib/64/libgcc_s.so base-sys-shlib compat,pic
./usr/lib/64/libgcc_s_p.a comp-obsolete obsolete
@@ -853,9 +853,9 @@
./usr/lib/o32/libgcc.a comp-c-lib compat
./usr/lib/o32/libgcc_eh.a comp-c-lib compat,pic
./usr/lib/o32/libgcc_eh_p.a comp-c-proflib compat,profile,pic
-./usr/lib/o32/libgcc_eh_pic.a comp-c-piclib compat,pic
+./usr/lib/o32/libgcc_eh_pic.a comp-c-piclib obsolete
./usr/lib/o32/libgcc_p.a comp-c-proflib compat,profile
-./usr/lib/o32/libgcc_pic.a comp-c-piclib compat,pic
+./usr/lib/o32/libgcc_pic.a comp-c-piclib obsolete
./usr/lib/o32/libgcc_s.a comp-obsolete obsolete
./usr/lib/o32/libgcc_s.so base-sys-shlib compat,pic
./usr/lib/o32/libgcc_s_p.a comp-obsolete obsolete
Index: src/distrib/sets/lists/comp/ad.mips64el
diff -u src/distrib/sets/lists/comp/ad.mips64el:1.56 src/distrib/sets/lists/comp/ad.mips64el:1.57
--- src/distrib/sets/lists/comp/ad.mips64el:1.56 Sun Sep 25 04:11:47 2011
+++ src/distrib/sets/lists/comp/ad.mips64el Fri Oct 7 09:15:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.56 2011/09/25 04:11:47 christos Exp $
+# $NetBSD: ad.mips64el,v 1.57 2011/10/07 09:15:21 mrg Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45
@@ -276,9 +276,9 @@
./usr/lib/64/libgcc.a comp-c-lib compat
./usr/lib/64/libgcc_eh.a comp-c-lib compat,pic
./usr/lib/64/libgcc_eh_p.a comp-c-proflib compat,profile,pic
-./usr/lib/64/libgcc_eh_pic.a comp-c-piclib compat,pic
+./usr/lib/64/libgcc_eh_pic.a comp-c-piclib obsolete
./usr/lib/64/libgcc_p.a comp-c-proflib compat,profile
-./usr/lib/64/libgcc_pic.a comp-c-piclib compat,pic
+./usr/lib/64/libgcc_pic.a comp-c-piclib obsolete
./usr/lib/64/libgcc_s.a comp-obsolete obsolete
./usr/lib/64/libgcc_s.so base-sys-shlib compat,pic
./usr/lib/64/libgcc_s_p.a comp-obsolete obsolete
@@ -853,9 +853,9 @@
./usr/lib/o32/libgcc.a comp-c-lib compat
./usr/lib/o32/libgcc_eh.a comp-c-lib compat,pic
./usr/lib/o32/libgcc_eh_p.a comp-c-proflib compat,profile,pic
-./usr/lib/o32/libgcc_eh_pic.a comp-c-piclib compat,pic
+./usr/lib/o32/libgcc_eh_pic.a comp-c-piclib obsolete
./usr/lib/o32/libgcc_p.a comp-c-proflib compat,profile
-./usr/lib/o32/libgcc_pic.a comp-c-piclib compat,pic
+./usr/lib/o32/libgcc_pic.a comp-c-piclib obsolete
./usr/lib/o32/libgcc_s.a comp-obsolete obsolete
./usr/lib/o32/libgcc_s.so base-sys-shlib compat,pic
./usr/lib/o32/libgcc_s_p.a comp-obsolete obsolete
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.140 src/distrib/sets/lists/comp/md.amd64:1.141
--- src/distrib/sets/lists/comp/md.amd64:1.140 Sun Sep 25 07:00:45 2011
+++ src/distrib/sets/lists/comp/md.amd64 Fri Oct 7 09:15:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.140 2011/09/25 07:00:45 mrg Exp $
+# $NetBSD: md.amd64,v 1.141 2011/10/07 09:15:21 mrg Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -545,10 +545,10 @@
./usr/lib/i386/libgcc_eh.a comp-c-lib compat,pic
./usr/lib/i386/libgcc_eh_g.a comp-c-proflib compat,debuglib
./usr/lib/i386/libgcc_eh_p.a comp-c-proflib compat,profile
-./usr/lib/i386/libgcc_eh_pic.a comp-c-piclib compat,pic
+./usr/lib/i386/libgcc_eh_pic.a comp-c-piclib obsolete
./usr/lib/i386/libgcc_g.a comp-c-proflib compat,debuglib
./usr/lib/i386/libgcc_p.a comp-c-proflib compat,profile
-./usr/lib/i386/libgcc_pic.a comp-c-piclib compat,pic
+./usr/lib/i386/libgcc_pic.a comp-c-piclib obsolete
./usr/lib/i386/libgcc_s.a comp-obsolete obsolete
./usr/lib/i386/libgcc_s.so comp-sys-shlib compat,pic
./usr/lib/i386/libgcc_s_g.a comp-c-proflib compat,debuglib
Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.125 src/distrib/sets/lists/comp/md.sparc64:1.126
--- src/distrib/sets/lists/comp/md.sparc64:1.125 Mon Sep 26 00:07:26 2011
+++ src/distrib/sets/lists/comp/md.sparc64 Fri Oct 7 09:15:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.125 2011/09/26 00:07:26 mrg Exp $
+# $NetBSD: md.sparc64,v 1.126 2011/10/07 09:15:21 mrg Exp $
./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45
./usr/include/ieeefp.h comp-c-include
./usr/include/sparc comp-c-include
@@ -404,10 +404,10 @@
./usr/lib/sparc/libgcc_eh.a comp-c-lib compat,pic
./usr/lib/sparc/libgcc_eh_g.a -unknown- compat,debuglib,pic
./usr/lib/sparc/libgcc_eh_p.a comp-c-proflib compat,profile,pic
-./usr/lib/sparc/libgcc_eh_pic.a comp-c-piclib compat,pic
+./usr/lib/sparc/libgcc_eh_pic.a comp-c-piclib obsolete
./usr/lib/sparc/libgcc_g.a -unknown- compat,debuglib
./usr/lib/sparc/libgcc_p.a comp-c-proflib compat,profile
-./usr/lib/sparc/libgcc_pic.a comp-c-piclib compat,pic
+./usr/lib/sparc/libgcc_pic.a comp-c-piclib obsolete
./usr/lib/sparc/libgcc_s.a comp-obsolete obsolete
./usr/lib/sparc/libgcc_s.so base-sys-shlib compat,pic
./usr/lib/sparc/libgcc_s_g.a comp-obsolete obsolete
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.194 src/distrib/sets/lists/comp/shl.mi:1.195
--- src/distrib/sets/lists/comp/shl.mi:1.194 Sun Sep 25 04:11:48 2011
+++ src/distrib/sets/lists/comp/shl.mi Fri Oct 7 09:15:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.194 2011/09/25 04:11:48 christos Exp $
+# $NetBSD: shl.mi,v 1.195 2011/10/07 09:15:21 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -39,8 +39,8 @@
./usr/lib/libg2c_pic.a comp-obsolete gcc=4,obsolete
./usr/lib/libgcc_eh.a comp-c-lib
./usr/lib/libgcc_eh_p.a comp-c-proflib profile
-./usr/lib/libgcc_eh_pic.a comp-c-piclib
-./usr/lib/libgcc_pic.a comp-c-lib
+./usr/lib/libgcc_eh_pic.a comp-c-piclib obsolete
+./usr/lib/libgcc_pic.a comp-c-lib obsolete
./usr/lib/libgmp.so comp-c-shlib obsolete
./usr/lib/libgmp.so.10 comp-c-shlib obsolete
./usr/lib/libgmp.so.10.2 comp-c-shlib obsolete
Index: src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.4 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.5
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.4 Mon Aug 15 09:19:21 2011
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Fri Oct 7 09:15:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/08/15 09:19:21 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/10/07 09:15:21 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -33,6 +33,8 @@ BUILDSYMLINKS+= ${GNUHOSTDIST}/gcc/confi
.endfor
. endif
+MKPIC:= no
+
.include <bsd.lib.mk>
Index: src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile:1.2 src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile:1.3
--- src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile:1.2 Mon Aug 15 09:19:21 2011
+++ src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile Fri Oct 7 09:15:22 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/08/15 09:19:21 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/10/07 09:15:22 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -14,6 +14,8 @@ LIB= gcc_eh
SRCS+= ${LIB2_EH}
COPTS.unwind-dw2.c = -Wno-stack-protector
+MKPIC:= no
+
.include <bsd.lib.mk>
.else
Index: src/libexec/ld.elf_so/Makefile
diff -u src/libexec/ld.elf_so/Makefile:1.109 src/libexec/ld.elf_so/Makefile:1.110
--- src/libexec/ld.elf_so/Makefile:1.109 Mon Jun 27 14:27:56 2011
+++ src/libexec/ld.elf_so/Makefile Fri Oct 7 09:15:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2011/06/27 14:27:56 uwe Exp $
+# $NetBSD: Makefile,v 1.110 2011/10/07 09:15:21 mrg Exp $
#
# NOTE: when changing ld.so, ensure that ldd still compiles.
#
@@ -121,8 +121,8 @@ DPADD+= ${CLIBOBJ}/libc.a
.if ${MACHINE_CPU} == "hppa" || ${MACHINE_CPU} == "sh3"
# for $$divU, $$remU etc. (millicode)
-LDADD+= -lgcc_pic
-DPADD+= ${LIBGCC_PIC}
+LDADD+= -lgcc
+DPADD+= ${LIBGCC}
.endif
STRIPFLAG=
Index: src/share/mk/bsd.hostprog.mk
diff -u src/share/mk/bsd.hostprog.mk:1.64 src/share/mk/bsd.hostprog.mk:1.65
--- src/share/mk/bsd.hostprog.mk:1.64 Sat Sep 10 16:57:35 2011
+++ src/share/mk/bsd.hostprog.mk Fri Oct 7 09:15:22 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.hostprog.mk,v 1.64 2011/09/10 16:57:35 apb Exp $
+# $NetBSD: bsd.hostprog.mk,v 1.65 2011/10/07 09:15:22 mrg Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.include <bsd.init.mk>
@@ -24,7 +24,6 @@ LIBEVENT?= /usr/lib/libevent.a
LIBFETCH?= /usr/lib/libfetch.a
LIBFORM?= /usr/lib/libform.a
LIBGCC?= /usr/lib/libgcc.a
-LIBGCC_PIC?= /usr/lib/libgcc_pic.a
LIBGNUMALLOC?= /usr/lib/libgnumalloc.a
LIBINTL?= /usr/lib/libintl.a
LIBIPSEC?= /usr/lib/libipsec.a
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.317 src/share/mk/bsd.lib.mk:1.318
--- src/share/mk/bsd.lib.mk:1.317 Sun Sep 25 11:20:41 2011
+++ src/share/mk/bsd.lib.mk Fri Oct 7 09:15:22 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.317 2011/09/25 11:20:41 apb Exp $
+# $NetBSD: bsd.lib.mk,v 1.318 2011/10/07 09:15:22 mrg Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -534,7 +534,7 @@ DPLIBC ?= ${DESTDIR}${LIBC_SO}
.else
LDLIBC ?= -nodefaultlibs
.if ${LIB} == "c"
-LDADD+= -lgcc_pic
+LDADD+= -lgcc
.endif
.endif
.endif
