[src/trunk]: src/external/gpl3/gcc/lib/libgcc regen and include the proper di...

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

details:   https://anonhg.NetBSD.org/src/rev/b497fd3eb7a0
branches:  trunk
changeset: 348518:b497fd3eb7a0
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Oct 22 03:55:03 2016 +0000

description:
regen and include the proper directory for x86_64

diffstat:

 external/gpl3/gcc/lib/libgcc/Makefile.inc        |  8 ++++++--
 external/gpl3/gcc/lib/libgcc/arch/i386/defs.mk   |  4 ++--
 external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk |  4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r a0c04f48044c -r b497fd3eb7a0 external/gpl3/gcc/lib/libgcc/Makefile.inc
--- a/external/gpl3/gcc/lib/libgcc/Makefile.inc Sat Oct 22 03:33:03 2016 +0000
+++ b/external/gpl3/gcc/lib/libgcc/Makefile.inc Sat Oct 22 03:55:03 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.33 2016/03/22 08:18:27 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.34 2016/10/22 03:55:03 christos Exp $
 
 LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
 
@@ -22,7 +22,11 @@
 CPPFLAGS+=     ${GCPPFLAGS:M-m*} ${GCPPFLAGS:M-f*}
 CPPFLAGS+=     ${G_EXTRA_HEADERS:M/*:H:u:S/^/-I/g}
 CPPFLAGS+=     -I${DIST}/libgcc -I${DIST}/libgcc/config
-CPPFLAGS+=     -I${DIST}/libgcc/config/${MACHINE_CPU}
+.if ${MACHINE_ARCH} == "x86_64"
+CPPFLAGS+=     -I${DIST}/libgcc/config/i386
+.else
+CPPFLAGS+=     -I${DIST}/libgcc/config/${LIBGCC_MACHINE_ARCH}
+.endif
 CPPFLAGS+=     -I${DIST}/gcc -I${DIST}/include -I.
 
 .if ${LIBGCC_MACHINE_ARCH} == "powerpc" || \
diff -r a0c04f48044c -r b497fd3eb7a0 external/gpl3/gcc/lib/libgcc/arch/i386/defs.mk
--- a/external/gpl3/gcc/lib/libgcc/arch/i386/defs.mk    Sat Oct 22 03:33:03 2016 +0000
+++ b/external/gpl3/gcc/lib/libgcc/arch/i386/defs.mk    Sat Oct 22 03:55:03 2016 +0000
@@ -1,9 +1,9 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: NetBSD: mknative-gcc,v 1.85 2016/03/15 21:38:32 mrg Exp 
+# Generated from: NetBSD: mknative-gcc,v 1.89 2016/10/05 19:25:49 christos Exp 
 # Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp 
 #
 G_INCLUDES=-I. -I. -I../.././gcc -I${GNUHOSTDIST}/libgcc -I${GNUHOSTDIST}/libgcc/. -I${GNUHOSTDIST}/libgcc/../gcc -I${GNUHOSTDIST}/libgcc/../include 
-G_LIB2ADD= ${GNUHOSTDIST}/libgcc/config/i386/cpuinfo.c enable-execute-stack.c
+G_LIB2ADD= ${GNUHOSTDIST}/libgcc/config/i386/cpuinfo.c ${GNUHOSTDIST}/libgcc/config/i386/32/tf-signs.c ${GNUHOSTDIST}/libgcc/config/i386/sfp-exceptions.c ${GNUHOSTDIST}/libgcc/soft-fp/addtf3.c 
${GNUHOSTDIST}/libgcc/soft-fp/divtf3.c ${GNUHOSTDIST}/libgcc/soft-fp/eqtf2.c ${GNUHOSTDIST}/libgcc/soft-fp/getf2.c ${GNUHOSTDIST}/libgcc/soft-fp/letf2.c ${GNUHOSTDIST}/libgcc/soft-fp/multf3.c 
${GNUHOSTDIST}/libgcc/soft-fp/negtf2.c ${GNUHOSTDIST}/libgcc/soft-fp/subtf3.c ${GNUHOSTDIST}/libgcc/soft-fp/unordtf2.c ${GNUHOSTDIST}/libgcc/soft-fp/fixtfsi.c 
${GNUHOSTDIST}/libgcc/soft-fp/fixunstfsi.c ${GNUHOSTDIST}/libgcc/soft-fp/floatsitf.c ${GNUHOSTDIST}/libgcc/soft-fp/floatunsitf.c ${GNUHOSTDIST}/libgcc/soft-fp/fixtfdi.c 
${GNUHOSTDIST}/libgcc/soft-fp/fixunstfdi.c ${GNUHOSTDIST}/libgcc/soft-fp/floatditf.c ${GNUHOSTDIST}/libgcc/soft-fp/floatunditf.c ${GNUHOSTDIST}/libgcc/soft-fp/extendsftf2.c 
${GNUHOSTDIST}/libgcc/soft-fp/extenddftf2.c ${GNUHOSTDIST}/libgcc/soft-fp/extendxftf2.c ${GNUHOSTDIST}/libgcc/soft-fp/trunctfsf2.c ${GNUHOSTDIST}/libgcc/soft-fp/trunctfdf2.c 
${GNUHOSTDIST}/libgcc/soft-fp/trunctfxf2.c enable-execute-stack.c
 G_LIB2ADDEH=${GNUHOSTDIST}/libgcc/unwind-dw2.c ${GNUHOSTDIST}/libgcc/unwind-dw2-fde-dip.c ${GNUHOSTDIST}/libgcc/unwind-sjlj.c ${GNUHOSTDIST}/libgcc/unwind-c.c ${GNUHOSTDIST}/libgcc/emutls.c
 G_LIB2ADD_ST=
 G_LIB1ASMFUNCS=
diff -r a0c04f48044c -r b497fd3eb7a0 external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk
--- a/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk  Sat Oct 22 03:33:03 2016 +0000
+++ b/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk  Sat Oct 22 03:55:03 2016 +0000
@@ -1,9 +1,9 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: NetBSD: mknative-gcc,v 1.85 2016/03/15 21:38:32 mrg Exp 
+# Generated from: NetBSD: mknative-gcc,v 1.89 2016/10/05 19:25:49 christos Exp 
 # Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp 
 #
 G_INCLUDES=-I. -I. -I../.././gcc -I${GNUHOSTDIST}/libgcc -I${GNUHOSTDIST}/libgcc/. -I${GNUHOSTDIST}/libgcc/../gcc -I${GNUHOSTDIST}/libgcc/../include 
-G_LIB2ADD= ${GNUHOSTDIST}/libgcc/config/i386/cpuinfo.c enable-execute-stack.c
+G_LIB2ADD= ${GNUHOSTDIST}/libgcc/config/i386/cpuinfo.c ${GNUHOSTDIST}/libgcc/config/i386/sfp-exceptions.c ${GNUHOSTDIST}/libgcc/soft-fp/addtf3.c ${GNUHOSTDIST}/libgcc/soft-fp/divtf3.c 
${GNUHOSTDIST}/libgcc/soft-fp/eqtf2.c ${GNUHOSTDIST}/libgcc/soft-fp/getf2.c ${GNUHOSTDIST}/libgcc/soft-fp/letf2.c ${GNUHOSTDIST}/libgcc/soft-fp/multf3.c ${GNUHOSTDIST}/libgcc/soft-fp/negtf2.c 
${GNUHOSTDIST}/libgcc/soft-fp/subtf3.c ${GNUHOSTDIST}/libgcc/soft-fp/unordtf2.c ${GNUHOSTDIST}/libgcc/soft-fp/fixtfsi.c ${GNUHOSTDIST}/libgcc/soft-fp/fixunstfsi.c 
${GNUHOSTDIST}/libgcc/soft-fp/floatsitf.c ${GNUHOSTDIST}/libgcc/soft-fp/floatunsitf.c ${GNUHOSTDIST}/libgcc/soft-fp/fixtfdi.c ${GNUHOSTDIST}/libgcc/soft-fp/fixunstfdi.c 
${GNUHOSTDIST}/libgcc/soft-fp/floatditf.c ${GNUHOSTDIST}/libgcc/soft-fp/floatunditf.c ${GNUHOSTDIST}/libgcc/soft-fp/fixtfti.c ${GNUHOSTDIST}/libgcc/soft-fp/fixunstfti.c 
${GNUHOSTDIST}/libgcc/soft-fp/floattitf.c ${GNUHOSTDIST}/libgcc/soft-fp/floatuntitf.c ${GNUHOSTDIST}/libgcc/soft-fp/extendsftf2.c ${GNUHOSTDIST}/libgcc/soft-fp/extenddftf2.c 
${GNUHOSTDIST}/libgcc/soft-fp/extendxftf2.c ${GNUHOSTDIST}/libgcc/soft-fp/trunctfsf2.c ${GNUHOSTDIST}/libgcc/soft-fp/trunctfdf2.c ${GNUHOSTDIST}/libgcc/soft-fp/trunctfxf2.c enable-execute-stack.c
 G_LIB2ADDEH=${GNUHOSTDIST}/libgcc/unwind-dw2.c ${GNUHOSTDIST}/libgcc/unwind-dw2-fde-dip.c ${GNUHOSTDIST}/libgcc/unwind-sjlj.c ${GNUHOSTDIST}/libgcc/unwind-c.c ${GNUHOSTDIST}/libgcc/emutls.c
 G_LIB2ADD_ST=
 G_LIB1ASMFUNCS=