[src/trunk]: src/external/gpl3/gcc/lib/libgcc clean out some unused code.

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

details:   https://anonhg.NetBSD.org/src/rev/0219727318c3
branches:  trunk
changeset: 768355:0219727318c3
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Aug 15 09:19:21 2011 +0000

description:
clean out some unused code.

diffstat:

 external/gpl3/gcc/lib/libgcc/Makefile.inc       |  12 +-----------
 external/gpl3/gcc/lib/libgcc/libgcc/Makefile    |  21 +--------------------
 external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile |  18 +-----------------
 external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile  |  18 +-----------------
 external/gpl3/gcc/lib/libgcc/libgcov/Makefile   |  22 +---------------------
 5 files changed, 5 insertions(+), 86 deletions(-)

diffs (203 lines):

diff -r 700e7f7ff381 -r 0219727318c3 external/gpl3/gcc/lib/libgcc/Makefile.inc
--- a/external/gpl3/gcc/lib/libgcc/Makefile.inc Mon Aug 15 06:13:40 2011 +0000
+++ b/external/gpl3/gcc/lib/libgcc/Makefile.inc Mon Aug 15 09:19:21 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.10 2011/07/07 01:27:47 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.11 2011/08/15 09:19:21 mrg Exp $
 
 .if ${MKGCC} != "no"
 .if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk)
@@ -28,8 +28,6 @@
 COMPILE.S=     ${CC} ${AFLAGS} ${CPPFLAGS} -c
 .endif
 
-.if !defined(MKNATIVE_LIBGCC_NEW)
-
 #
 # Old style libgcc build procedure.
 #
@@ -133,14 +131,6 @@
        ${_MKTARGET_CREATE}
        printf '#define FLOAT\n#include <fp-bit.c>\n' >${.TARGET}
 
-.else  # defined(MKNATIVE_LIBGCC_NEW)
-
-#
-# New style libgcc build procedure.
-#
-
-.endif # defined(MKNATIVE_LIBGCC_NEW)
-
 #
 # Common rules.
 #
diff -r 700e7f7ff381 -r 0219727318c3 external/gpl3/gcc/lib/libgcc/libgcc/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcc/Makefile      Mon Aug 15 06:13:40 2011 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc/Makefile      Mon Aug 15 09:19:21 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2011/07/10 02:39:57 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2011/08/15 09:19:21 mrg Exp $
 
 REQUIRETOOLS=  yes
 NOLINT=                # defined
@@ -11,8 +11,6 @@
 
 .cc: # disable .cc->NULL transform
 
-.if !defined(MKNATIVE_LIBGCC_NEW)
-
 # XXX handle this better?
 .if ${MACHINE} == "emips"
 G_LIB2ADD_HACK+=       ${GNUHOSTDIST}/gcc/config/floatunsidf.c \
@@ -35,23 +33,8 @@
 .endfor
 .   endif
 
-.else  # defined(MKNATIVE_LIBGCC_NEW)
-
-.include "../Makefile.srcs"
-
-# New style.
-TMPLSRCS=      ${TMPLSRCS.libgcc.a}
-TMPLFPSRCS=    ${TMPLFPSRCS.libgcc.a}
-TMPLASMSRCS=   ${TMPLASMSRCS.libgcc.a}
-SRCS=          ${SRCS.libgcc.a}
-
-.include "../Makefile.wrapper"
-
-.endif # defined(MKNATIVE_LIBGCC_NEW)
-
 .include <bsd.lib.mk>
 
-.if !defined(MKNATIVE_LIBGCC_NEW)
 
 CLEANFILES+=   ${SOBJS:=.tmp1} ${SOBJS:=.tmp2}
 
@@ -83,8 +66,6 @@
 .endif
        rm -f ${.TARGET}.tmp1
 
-.endif # !defined(MKNATIVE_LIBGCC_NEW)
-
 .else
 .include <bsd.prog.mk> # do nothing
 .endif
diff -r 700e7f7ff381 -r 0219727318c3 external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile   Mon Aug 15 06:13:40 2011 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile   Mon Aug 15 09:19:21 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2011/06/21 06:02:26 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2011/08/15 09:19:21 mrg Exp $
 
 REQUIRETOOLS=  yes
 NOLINT=                # defined
@@ -11,25 +11,9 @@
 
 .cc: # disable .cc->NULL transform
 
-.if !defined(MKNATIVE_LIBGCC_NEW)
-
 SRCS+=         ${LIB2_EH}
 COPTS.unwind-dw2.c = -Wno-stack-protector
 
-.else  # defined(MKNATIVE_LIBGCC_NEW)
-
-.include "../Makefile.srcs"
-
-# New style.
-TMPLSRCS=      ${TMPLSRCS.libgcc_eh.a}
-TMPLFPSRCS=    ${TMPLFPSRCS.libgcc_eh.a}
-TMPLASMSRCS=   ${TMPLASMSRCS.libgcc_eh.a}
-SRCS=          ${SRCS.libgcc_eh.a}
-
-.include "../Makefile.wrapper"
-
-.endif # defined(MKNATIVE_LIBGCC_NEW)
-
 .include <bsd.lib.mk>
 
 .else
diff -r 700e7f7ff381 -r 0219727318c3 external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile    Mon Aug 15 06:13:40 2011 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile    Mon Aug 15 09:19:21 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2011/07/10 02:39:57 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2011/08/15 09:19:21 mrg Exp $
 
 USE_SHLIBDIR=  yes
 REQUIRETOOLS=  yes
@@ -21,8 +21,6 @@
 LDFLAGS+=      -nodefaultlibs
 LDFLAGS+=      -Wl,--version-script=${.OBJDIR}/libgcc.map
 
-.if !defined(MKNATIVE_LIBGCC_NEW)
-
 # XXX handle this better?
 .if ${MACHINE_CPU} == "mips" && !(${MKSOFTFLOAT} != "no")
 G_LIB2ADD+=    ${GNUHOSTDIST}/gcc/config/floatunsidf.c \
@@ -32,20 +30,6 @@
 SRCS+=         ${LIB2FUNCS} ${LIB2DIVMOD} ${LIB2_EH} \
                ${G_LIB2ADD:T:S/.asm/.S/} ${LIB1ASMFUNCS}
 
-.else  # defined(MKNATIVE_LIBGCC_NEW)
-
-.include "../Makefile.srcs"
-
-# New style.
-TMPLSRCS=      ${TMPLSRCS.libgcc_s.so}
-TMPLFPSRCS=    ${TMPLFPSRCS.libgcc_s.so}
-TMPLASMSRCS=   ${TMPLASMSRCS.libgcc_s.so}
-SRCS=          ${SRCS.libgcc_s.so}
-
-.include "../Makefile.wrapper"
-
-.endif # defined(MKNATIVE_LIBGCC_NEW)
-
 COPTS.unwind-dw2.c = -Wno-stack-protector
 
 DPADD+=                libgcc.map
diff -r 700e7f7ff381 -r 0219727318c3 external/gpl3/gcc/lib/libgcc/libgcov/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcov/Makefile     Mon Aug 15 06:13:40 2011 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcov/Makefile     Mon Aug 15 09:19:21 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2011/06/21 06:02:26 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2011/08/15 09:19:21 mrg Exp $
 
 REQUIRETOOLS=  yes
 NOPIC=         # defined
@@ -18,35 +18,15 @@
 CPPFLAGS+=     -I${.CURDIR}/arch/${MACHINE_ARCH}
 CPPFLAGS+=     -Wno-stack-protector
 
-.if !defined(MKNATIVE_LIBGCC_NEW)
-
 DPSRCS+=       ${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk
 SRCS+=         ${LIBGCOVSRCS}
 
-.else  # defined(MKNATIVE_LIBGCC_NEW)
-
-.include "../Makefile.srcs"
-
-# New style.
-SRCS=          ${SRCS.libgcov.a}
-TMPLSRCS=      ${TMPLSRCS.libgcov.a}
-TMPLFPSRCS=    ${TMPLFPSRCS.libgcov.a}
-TMPLASMSRCS=   ${TMPLASMSRCS.libgcov.a}
-
-.include "../Makefile.wrapper"
-
-.endif # defined(MKNATIVE_LIBGCC_NEW)
-
-.if !defined(MKNATIVE_LIBGCC_NEW)
-
 CLEANFILES+=   ${LIBGCOVSRCS}
 
 ${LIBGCOVSRCS}: ${.CURDIR}/Makefile
        ${_MKTARGET_CREATE}
        printf '#define L${.PREFIX}\n#include <libgcov.c>\n' >${.TARGET}
 
-.endif # !defined(MKNATIVE_LIBGCC_NEW)
-
 .include <bsd.lib.mk>
 .else
 .include <bsd.prog.mk> # do nothing