CVS commit: src/external/gpl3/gcc/lib/libgcc/libgcc
Module Name:src
Committed By: martin
Date: Thu Mar 31 06:59:44 UTC 2016
Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
Log Message:
Extend the "mips64 hack" to all MKSOFTFLOAT builds - avoid duplicate
symbols in libgcc.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/external/gpl3/gcc/lib/libgcc/libgcc/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/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.25 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.26
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.25 Wed Mar 23 05:28:01 2016
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Thu Mar 31 06:59:44 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2016/03/23 05:28:01 mrg Exp $
+# $NetBSD: Makefile,v 1.26 2016/03/31 06:59:44 martin Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -23,7 +23,7 @@ LIB2ADD_HACK+= ${GNUHOSTDIST}/gcc/config
.endif
# XXXGCC5 GCC 5.3 has all these in libgcc and we have them in libc.
-.if ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb"
+.if ${MKSOFTFLOAT} == "yes"
LIB2ADD_EDITED= ${G_LIB2ADD:T:Nfloatsisf.c:Nfloatunsisf.c:Nfloatsidf.c:Nfloatunsidf.c:Nfixsfsi.c:Nextendsfdf2.c:Naddsf3.c:Nmulsf3.c:Ndivsf3.c:Nadddf3.c:Nsubdf3.c:Nmuldf3.c:Ndivdf3.c:Nfixdfsi.c:S/.asm/.S/}
.else
LIB2ADD_EDITED= ${G_LIB2ADD:T:S/.asm/.S/}
CVS commit: src/external/gpl3/gcc/lib/libgcc/libgcc
Module Name:src
Committed By: matt
Date: Sun Nov 2 14:54:27 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
Log Message:
Avoid using ld -x. Instead use ${OBJCOPY} ${OBJCOPYLIBFLAGS} to string
local symbols.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/gpl3/gcc/lib/libgcc/libgcc/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/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.22 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.23
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.22 Sun Jun 1 19:51:01 2014
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Sun Nov 2 14:54:27 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/06/01 19:51:01 mrg Exp $
+# $NetBSD: Makefile,v 1.23 2014/11/02 14:54:27 matt Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -50,11 +50,12 @@ CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.t
${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp1
${NM} -pg ${.TARGET}.tmp1 | \
${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
- ${CC} ${COPTS} -Wl,-x -r -nostdinc -nostdlib ${CPUFLAGS} -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+ ${CC} ${COPTS} -r -nostdinc -nostdlib ${CPUFLAGS} -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+ ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.tmp2
.if defined(COPTS) && !empty(COPTS:M*-g*)
mv ${.TARGET}.tmp2 ${.TARGET}
.else
- ${LD} -x -r ${.TARGET}.tmp2 -o ${.TARGET}
+ ${LD} -r ${.TARGET}.tmp2 -o ${.TARGET}
rm -f ${.TARGET}.tmp2
.endif
rm -f ${.TARGET}.tmp1
@@ -64,11 +65,12 @@ CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.t
${COMPILE.S} ${PICFLAGS} ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}.tmp1
${NM} -pg ${.TARGET}.tmp1 | \
${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
- ${CC} ${COPTS} -Wl,-x -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+ ${CC} ${COPTS} -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+ ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.tmp2
.if defined(COPTS) && !empty(COPTS:M*-g*)
mv ${.TARGET}.tmp2 ${.TARGET}
.else
- ${LD} -x -r ${.TARGET}.tmp2 -o ${.TARGET}
+ ${LD} -r ${.TARGET}.tmp2 -o ${.TARGET}
rm -f ${.TARGET}.tmp2
.endif
rm -f ${.TARGET}.tmp1
CVS commit: src/external/gpl3/gcc/lib/libgcc/libgcc
Module Name:src
Committed By: martin
Date: Thu Feb 27 09:05:08 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
Log Message:
Explicitly remove .note.netbsd.mcmodel sections (eroneously generated
on sparc64 during intermediate linking)
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gcc/lib/libgcc/libgcc/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/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.19 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.20
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.19 Wed Feb 26 09:54:32 2014
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Thu Feb 27 09:05:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/02/26 09:54:32 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2014/02/27 09:05:08 martin Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -61,6 +61,7 @@ CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.t
${NM} -pg ${.TARGET}.tmp1 | \
${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
${CC} ${COPTS} -r -nostdinc -nostdlib ${CPUFLAGS} -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+ ${OBJCOPY} -R .note.netbsd.mcmodel ${.TARGET}.tmp2
.if defined(COPTS) && !empty(COPTS:M*-g*)
mv ${.TARGET}.tmp2 ${.TARGET}
.else
@@ -75,6 +76,7 @@ CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.t
${NM} -pg ${.TARGET}.tmp1 | \
${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
${CC} ${COPTS} -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+ ${OBJCOPY} -R .note.netbsd.mcmodel ${.TARGET}.tmp2
.if defined(COPTS) && !empty(COPTS:M*-g*)
mv ${.TARGET}.tmp2 ${.TARGET}
.else
CVS commit: src/external/gpl3/gcc/lib/libgcc/libgcc
Module Name:src
Committed By: matt
Date: Sat Jan 11 02:45:52 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
Log Message:
Don't pass -Wl,-x to ${CC} since that strips symbols needed by ARM BE.
Let the OBJCOPY strip them.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gcc/lib/libgcc/libgcc/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/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.17 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.18
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.17 Sat Jan 11 00:30:23 2014
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Sat Jan 11 02:45:52 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/01/11 00:30:23 matt Exp $
+# $NetBSD: Makefile,v 1.18 2014/01/11 02:45:52 matt Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -59,7 +59,7 @@ CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.t
${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp1
${NM} -pg ${.TARGET}.tmp1 | \
${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
- ${CC} ${COPTS} -Wl,-x -r -nostdinc -nostdlib ${CPUFLAGS} -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+ ${CC} ${COPTS} -r -nostdinc -nostdlib ${CPUFLAGS} -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
.if defined(COPTS) && !empty(COPTS:M*-g*)
mv ${.TARGET}.tmp2 ${.TARGET}
.else
@@ -73,7 +73,7 @@ CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.t
${COMPILE.S} ${PICFLAGS} ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}.tmp1
${NM} -pg ${.TARGET}.tmp1 | \
${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
- ${CC} ${COPTS} -Wl,-x -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+ ${CC} ${COPTS} -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
.if defined(COPTS) && !empty(COPTS:M*-g*)
mv ${.TARGET}.tmp2 ${.TARGET}
.else
CVS commit: src/external/gpl3/gcc/lib/libgcc/libgcc
Module Name:src
Committed By: matt
Date: Sat Jan 11 00:30:23 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
Log Message:
Don't use ${LD} -x because it screws up ARM BE.
Use ${OBJCOPY} ${OBJCOPYLIBFLAGS} instead so that $a/$d/$t are preserved.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/gpl3/gcc/lib/libgcc/libgcc/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/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.16 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.17
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.16 Wed Oct 2 18:25:43 2013
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Sat Jan 11 00:30:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2013/10/02 18:25:43 christos Exp $
+# $NetBSD: Makefile,v 1.17 2014/01/11 00:30:23 matt Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -63,7 +63,7 @@ CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.t
.if defined(COPTS) && !empty(COPTS:M*-g*)
mv ${.TARGET}.tmp2 ${.TARGET}
.else
- ${LD} -x -r ${.TARGET}.tmp2 -o ${.TARGET}
+ ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.tmp2 ${.TARGET}
rm -f ${.TARGET}.tmp2
.endif
rm -f ${.TARGET}.tmp1
@@ -77,7 +77,7 @@ CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.t
.if defined(COPTS) && !empty(COPTS:M*-g*)
mv ${.TARGET}.tmp2 ${.TARGET}
.else
- ${LD} -x -r ${.TARGET}.tmp2 -o ${.TARGET}
+ ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.tmp2 ${.TARGET}
rm -f ${.TARGET}.tmp2
.endif
rm -f ${.TARGET}.tmp1
CVS commit: src/external/gpl3/gcc/lib/libgcc/libgcc
Module Name:src
Committed By: christos
Date: Wed Oct 2 18:25:43 UTC 2013
Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
Log Message:
If building with MKPIC=no, then set PICFLAGS to empty, otherwise bsd.lib.mk
sets PICFLAGS=-fPIC and we pick this via CSHLIBFLAGS to build .o objects.
This breaks the sun2 port, because with -fPIC we end up producing short
relative pic branches for $_exception_handler, so we get relocation errors.
Arguably:
1. MKPIC=no should not set PICFLAGS in bsd.lib.mk
2. CSHLIBFLAGS should not be used in non pic (.o) productions
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/lib/libgcc/libgcc/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/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.15 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.16
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.15 Thu Sep 12 11:36:14 2013
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Wed Oct 2 14:25:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2013/09/12 15:36:14 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2013/10/02 18:25:43 christos Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -28,6 +28,7 @@ SRCS+= ${LIB2FUNCS} ${LIB2FUNCS_ST} ${L
.if empty(LIBGCC_MACHINE_ARCH:Mearm*)
SRCS+= ${LIB2_EH} ${LIB2_EHASM}
.endif
+PICFLAGS=
.else
CPPFLAGS+= -DPIC
.endif
CVS commit: src/external/gpl3/gcc/lib/libgcc/libgcc
Module Name:src
Committed By: matt
Date: Tue Apr 30 02:28:16 UTC 2013
Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
Log Message:
Use !empty(LIBGCC_MACHINE_ARCH:Mearm*)
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/lib/libgcc/libgcc/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/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.12 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.13
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.12 Thu Feb 14 15:42:31 2013
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Tue Apr 30 02:28:16 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2013/02/14 15:42:31 matt Exp $
+# $NetBSD: Makefile,v 1.13 2013/04/30 02:28:16 matt Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -24,7 +24,7 @@ SRCS+= ${LIB2FUNCS} ${LIB2FUNCS_ST} ${L
${G_LIB2ADD_ST} ${LIB1ASMFUNCS}
.if ${MKPIC} == "no"
LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH}
-.if ${LIBGCC_MACHINE_ARCH:Mearm*} == ""
+.if empty(LIBGCC_MACHINE_ARCH:Mearm*)
SRCS+= ${LIB2_EH} ${LIB2_EHASM}
.endif
.else
CVS commit: src/external/gpl3/gcc/lib/libgcc/libgcc
Module Name:src
Committed By: matt
Date: Thu Feb 14 15:42:31 UTC 2013
Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
Log Message:
Make sure LIBGCC_MACHINE_ARCH is always defined.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/lib/libgcc/libgcc/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/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.11 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.12
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.11 Thu Feb 14 09:19:28 2013
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Thu Feb 14 15:42:31 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/02/14 09:19:28 matt Exp $
+# $NetBSD: Makefile,v 1.12 2013/02/14 15:42:31 matt Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -23,6 +23,7 @@ SRCS+= ${LIB2FUNCS} ${LIB2FUNCS_ST} ${L
${G_LIB2ADD_HACK:T:S/.asm/.S/} ${G_LIB2ADD:T:S/.asm/.S/} \
${G_LIB2ADD_ST} ${LIB1ASMFUNCS}
.if ${MKPIC} == "no"
+LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH}
.if ${LIBGCC_MACHINE_ARCH:Mearm*} == ""
SRCS+= ${LIB2_EH} ${LIB2_EHASM}
.endif
CVS commit: src/external/gpl3/gcc/lib/libgcc/libgcc
Module Name:src
Committed By: matt
Date: Mon Aug 6 02:34:28 UTC 2012
Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
Log Message:
on earm, don't include EH code.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/lib/libgcc/libgcc/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/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.9 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.10
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.9 Mon Aug 6 01:38:29 2012
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Mon Aug 6 02:34:28 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/08/06 01:38:29 matt Exp $
+# $NetBSD: Makefile,v 1.10 2012/08/06 02:34:28 matt Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -23,7 +23,9 @@ SRCS+= ${LIB2FUNCS} ${LIB2FUNCS_ST} ${L
${G_LIB2ADD_HACK:T:S/.asm/.S/} ${G_LIB2ADD:T:S/.asm/.S/} \
${G_LIB2ADD_ST} ${LIB1ASMFUNCS}
.if ${MKPIC} == "no"
+.if ${MACHINE_ARCH} != "earm" && ${MACHINE_ARCH} != "earmeb"
SRCS+= ${LIB2_EH} ${LIB2_EHASM}
+.endif
.else
CPPFLAGS+= -DPIC
.endif
CVS commit: src/external/gpl3/gcc/lib/libgcc/libgcc
Module Name:src
Committed By: matt
Date: Mon Aug 6 01:38:30 UTC 2012
Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
Log Message:
Add LIB2_EHASM to SRCS
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/lib/libgcc/libgcc/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/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.8 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.9
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.8 Sat Oct 22 10:41:50 2011
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Mon Aug 6 01:38:29 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/10/22 10:41:50 tron Exp $
+# $NetBSD: Makefile,v 1.9 2012/08/06 01:38:29 matt Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -20,9 +20,10 @@ G_LIB2ADD_HACK+= ${GNUHOSTDIST}/gcc/conf
.endif
SRCS+= ${LIB2FUNCS} ${LIB2FUNCS_ST} ${LIB2DIVMOD} \
- ${G_LIB2ADD_HACK:T:S/.asm/.S/} ${G_LIB2ADD:T:S/.asm/.S/} ${G_LIB2ADD_ST} ${LIB1ASMFUNCS}
+ ${G_LIB2ADD_HACK:T:S/.asm/.S/} ${G_LIB2ADD:T:S/.asm/.S/} \
+ ${G_LIB2ADD_ST} ${LIB1ASMFUNCS}
.if ${MKPIC} == "no"
-SRCS+= ${LIB2_EH}
+SRCS+= ${LIB2_EH} ${LIB2_EHASM}
.else
CPPFLAGS+= -DPIC
.endif
CVS commit: src/external/gpl3/gcc/lib/libgcc/libgcc
Module Name:src
Committed By: tron
Date: Sat Oct 22 10:41:50 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
Log Message:
Fix build with stack smash protection enabled.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/lib/libgcc/libgcc/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/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.7 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.8
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.7 Mon Oct 17 14:20:54 2011
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Sat Oct 22 10:41:50 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/10/17 14:20:54 chs Exp $
+# $NetBSD: Makefile,v 1.8 2011/10/22 10:41:50 tron Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -41,6 +41,8 @@ BUILDSYMLINKS+= ${GNUHOSTDIST}/gcc/confi
# the -fpic/-FPIC present in ${G_LIBGCC2_CFLAGS}.
MKPIC:= no
+COPTS.unwind-dw2.c = -Wno-stack-protector
+
.include
CVS commit: src/external/gpl3/gcc/lib/libgcc/libgcc
Module Name:src
Committed By: mrg
Date: Tue Oct 11 03:10:27 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
Log Message:
force on -DPIC and re-apply the old .pico rules again.
i'd expect this to help hppa/sh3 builds, but it doesn't entirely.
it does get the related command lines much closer though.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/lib/libgcc/libgcc/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/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.5 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.6
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.5 Fri Oct 7 09:15:21 2011
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Tue Oct 11 03:10:26 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/10/07 09:15:21 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2011/10/11 03:10:26 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -21,6 +21,8 @@ SRCS+= ${LIB2FUNCS} ${LIB2FUNCS_ST} ${L
${G_LIB2ADD_HACK:T:S/.asm/.S/} ${G_LIB2ADD:T:S/.asm/.S/} ${G_LIB2ADD_ST} ${LIB1ASMFUNCS}
.if ${MKPIC} == "no"
SRCS+= ${LIB2_EH}
+.else
+CPPFLAGS+= -DPIC
.endif
# These usually just have "foo.S", we need to link from the
@@ -33,6 +35,8 @@ BUILDSYMLINKS+= ${GNUHOSTDIST}/gcc/confi
.endfor
. endif
+# Force building libgcc.a. It will be PIC from -DPIC above and also
+# the -fpic/-FPIC present in ${G_LIBGCC2_CFLAGS}.
MKPIC:= no
.include
@@ -40,7 +44,7 @@ MKPIC:= no
CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.tmp2}
-.c.pico:
+.c.o:
${_MKTARGET_COMPILE}
${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp1
${NM} -pg ${.TARGET}.tmp1 | \
@@ -54,7 +58,7 @@ CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.t
.endif
rm -f ${.TARGET}.tmp1
-.S.pico .s.pico:
+.S.o .s.o:
${_MKTARGET_COMPILE}
${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}.tmp1
${NM} -pg ${.TARGET}.tmp1 | \
