Module Name: src
Committed By: christos
Date: Sat Oct 22 03:55:03 UTC 2016
Modified Files:
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
src/external/gpl3/gcc/lib/libgcc/arch/i386: defs.mk
src/external/gpl3/gcc/lib/libgcc/arch/x86_64: defs.mk
Log Message:
regen and include the proper directory for x86_64
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/lib/libgcc/arch/i386/defs.mk
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk
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/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.33 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.34
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.33 Tue Mar 22 04:18:27 2016
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Fri Oct 21 23:55:03 2016
@@ -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+= -I${GCCARCH} ${GCPPFLAGS:M-D*
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" || \
Index: src/external/gpl3/gcc/lib/libgcc/arch/i386/defs.mk
diff -u src/external/gpl3/gcc/lib/libgcc/arch/i386/defs.mk:1.3 src/external/gpl3/gcc/lib/libgcc/arch/i386/defs.mk:1.4
--- src/external/gpl3/gcc/lib/libgcc/arch/i386/defs.mk:1.3 Wed Mar 16 06:56:20 2016
+++ src/external/gpl3/gcc/lib/libgcc/arch/i386/defs.mk Fri Oct 21 23:55:03 2016
@@ -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/s
oft-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=
Index: src/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk
diff -u src/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk:1.2 src/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk:1.3
--- src/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk:1.2 Wed Mar 16 01:29:39 2016
+++ src/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk Fri Oct 21 23:55:03 2016
@@ -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/exte
ndsftf2.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=
