Module Name: src
Committed By: mrg
Date: Sun Mar 14 00:26:10 UTC 2010
Modified Files:
src/external/gpl3/binutils/lib/libbfd: Makefile
src/gnu/lib/libgcc4: Makefile.inc
src/gnu/lib/libgcc4/libgcc: Makefile
src/gnu/usr.bin/gdb6/bfd: Makefile
src/lib/libc/arch/powerpc/string: Makefile.inc
src/sys/arch/amiga/stand/bootblock/boot: Makefile
src/sys/arch/amiga/stand/bootblock/bootxx_ffs: Makefile
src/sys/arch/amiga/stand/bootblock/ppcboot: Makefile
Log Message:
update all of these makefiles for the .so -> .pico change.
most of them are most harmless, but the libgcc parts are quite essential.
before this change, all the special rules for .pico files were not applied,
and exception handling wasn't enabled. this caused c++ exceptions not to
work on sparc64.
this fixes the build of boost-headers (it was correctly calling exception
support broken!), which in turn makes all the things that depend upon it
to actually work again on sparc64.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/lib/libbfd/Makefile
cvs rdiff -u -r1.19 -r1.20 src/gnu/lib/libgcc4/Makefile.inc
cvs rdiff -u -r1.10 -r1.11 src/gnu/lib/libgcc4/libgcc/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/gdb6/bfd/Makefile
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/arch/powerpc/string/Makefile.inc
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/amiga/stand/bootblock/boot/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/lib/libbfd/Makefile
diff -u src/external/gpl3/binutils/lib/libbfd/Makefile:1.3 src/external/gpl3/binutils/lib/libbfd/Makefile:1.4
--- src/external/gpl3/binutils/lib/libbfd/Makefile:1.3 Fri Sep 11 22:36:12 2009
+++ src/external/gpl3/binutils/lib/libbfd/Makefile Sun Mar 14 00:26:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/09/11 22:36:12 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2010/03/14 00:26:09 mrg Exp $
NOLINKLIB= # defined
NOLINT= # defined
@@ -52,7 +52,7 @@
.include <bsd.info.mk>
${OBJS} ${SOBJS}: elf32-target.h elf64-target.h
-targets.o targets.so: targmatch.h Makefile
+targets.o targets.pico: targmatch.h Makefile
.else
.include <bsd.prog.mk> # do nothing
.endif
Index: src/gnu/lib/libgcc4/Makefile.inc
diff -u src/gnu/lib/libgcc4/Makefile.inc:1.19 src/gnu/lib/libgcc4/Makefile.inc:1.20
--- src/gnu/lib/libgcc4/Makefile.inc:1.19 Fri Dec 18 13:57:10 2009
+++ src/gnu/lib/libgcc4/Makefile.inc Sun Mar 14 00:26:10 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.19 2009/12/18 13:57:10 uebayasi Exp $
+# $NetBSD: Makefile.inc,v 1.20 2010/03/14 00:26:10 mrg Exp $
.if ${MKGCC} != "no"
.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk)
@@ -101,7 +101,7 @@
${_MKTARGET_COMPILE}
${COMPILE.c} -fexceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC}
-${LIB2_EH:.c=.so}:
+${LIB2_EH:.c=.pico}:
${_MKTARGET_COMPILE}
${COMPILE.c} ${CPICFLAGS} -fexceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC}
@@ -109,7 +109,7 @@
${_MKTARGET_COMPILE}
${COMPILE.c} -fexceptions -fnon-call-exceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC}
-${G_LIB2_DIVMOD_FUNCS:=.so}:
+${G_LIB2_DIVMOD_FUNCS:=.pico}:
${_MKTARGET_COMPILE}
${COMPILE.c} ${CPICFLAGS} -fexceptions -fnon-call-exceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC}
Index: src/gnu/lib/libgcc4/libgcc/Makefile
diff -u src/gnu/lib/libgcc4/libgcc/Makefile:1.10 src/gnu/lib/libgcc4/libgcc/Makefile:1.11
--- src/gnu/lib/libgcc4/libgcc/Makefile:1.10 Fri Dec 18 13:57:10 2009
+++ src/gnu/lib/libgcc4/libgcc/Makefile Sun Mar 14 00:26:10 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/12/18 13:57:10 uebayasi Exp $
+# $NetBSD: Makefile,v 1.11 2010/03/14 00:26:10 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -39,7 +39,7 @@
CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.tmp2}
-.c.so:
+.c.pico:
${_MKTARGET_COMPILE}
${COMPILE.c} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp1
${NM} -pg ${.TARGET}.tmp1 | \
@@ -53,7 +53,7 @@
.endif
rm -f ${.TARGET}.tmp1
-.S.so .s.so:
+.S.pico .s.pico:
${_MKTARGET_COMPILE}
${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}.tmp1
${NM} -pg ${.TARGET}.tmp1 | \
Index: src/gnu/usr.bin/gdb6/bfd/Makefile
diff -u src/gnu/usr.bin/gdb6/bfd/Makefile:1.4 src/gnu/usr.bin/gdb6/bfd/Makefile:1.5
--- src/gnu/usr.bin/gdb6/bfd/Makefile:1.4 Sat Oct 25 22:27:35 2008
+++ src/gnu/usr.bin/gdb6/bfd/Makefile Sun Mar 14 00:26:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/10/25 22:27:35 apb Exp $
+# $NetBSD: Makefile,v 1.5 2010/03/14 00:26:09 mrg Exp $
.include <bsd.own.mk>
@@ -34,7 +34,7 @@
.endif
${OBJS} ${SOBJS}: elf32-target.h elf64-target.h
-targets.o targets.so: targmatch.h Makefile
+targets.o targets.pico: targmatch.h Makefile
targmatch.h: config.bfd targmatch.sed
${_MKTARGET_CREATE}
Index: src/lib/libc/arch/powerpc/string/Makefile.inc
diff -u src/lib/libc/arch/powerpc/string/Makefile.inc:1.12 src/lib/libc/arch/powerpc/string/Makefile.inc:1.13
--- src/lib/libc/arch/powerpc/string/Makefile.inc:1.12 Tue Aug 11 17:30:43 2009
+++ src/lib/libc/arch/powerpc/string/Makefile.inc Sun Mar 14 00:26:10 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2009/08/11 17:30:43 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.13 2010/03/14 00:26:10 mrg Exp $
SRCS+= bzero.S ffs.S strlen.S
NO_SRCS+= memset.S
@@ -9,16 +9,16 @@
.if ${MACHINE} == "evbppc"
bcopy.o: bcopy.c
bcopy.po: bcopy.c
-bcopy.so: bcopy.c
+bcopy.pico: bcopy.c
memcpy.o: memcpy.c
memcpy.po: memcpy.c
-memcpy.so: memcpy.c
+memcpy.pico: memcpy.c
memcmp.o: memcmp.c
memcmp.po: memcmp.c
-memcmp.so: memcmp.c
+memcmp.pico: memcmp.c
memmove.o: memmove.c
memmove.po: memmove.c
-memmove.so: memmove.c
+memmove.pico: memmove.c
.else
SRCS+= memcmp.S bcopy.S memcpy.S memmove.S
.endif
Index: src/sys/arch/amiga/stand/bootblock/boot/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.41 src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.42
--- src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.41 Tue Dec 29 20:21:45 2009
+++ src/sys/arch/amiga/stand/bootblock/boot/Makefile Sun Mar 14 00:26:10 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2009/12/29 20:21:45 elad Exp $
+# $NetBSD: Makefile,v 1.42 2010/03/14 00:26:10 mrg Exp $
.include <bsd.sys.mk> # for HOST_SH
@@ -32,7 +32,7 @@
# prefer our assembler versions over assembler, and assembler over C:
.SUFFIXES:
-.SUFFIXES: .out .o .po .so .s .S .c .cc .C .f .y .l .ln .m4 .sh
+.SUFFIXES: .out .o .po .pico .so .s .S .c .cc .C .f .y .l .ln .m4 .sh
FILES= boot.amiga
BINDIR=/usr/mdec
Index: src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.12 src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.13
--- src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.12 Tue Dec 29 20:21:46 2009
+++ src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile Sun Mar 14 00:26:10 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/12/29 20:21:46 elad Exp $
+# $NetBSD: Makefile,v 1.13 2010/03/14 00:26:10 mrg Exp $
### what we need:
@@ -18,7 +18,7 @@
# prefer our assembler versions over assembler, and assembler over C:
.SUFFIXES:
-.SUFFIXES: .out .o .po .so .s .S .c .cc .C .f .y .l .ln .m4 .sh
+.SUFFIXES: .out .o .po .pico .so .s .S .c .cc .C .f .y .l .ln .m4 .sh
FILES= bootxx_ffs bootxx_fd
BINDIR=/usr/mdec
Index: src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile:1.7 src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile:1.8
--- src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile:1.7 Tue Dec 29 20:21:46 2009
+++ src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile Sun Mar 14 00:26:10 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/12/29 20:21:46 elad Exp $
+# $NetBSD: Makefile,v 1.8 2010/03/14 00:26:10 mrg Exp $
### what we need:
@@ -13,7 +13,7 @@
# prefer our assembler versions over assembler, and assembler over C:
.SUFFIXES:
-.SUFFIXES: .out .o .po .so .s .S .c .cc .C .f .y .l .ln .m4 .sh
+.SUFFIXES: .out .o .po .pico .so .s .S .c .cc .C .f .y .l .ln .m4 .sh
FILES= xxppcboot fdppcboot
BINDIR=/usr/mdec
