Module Name: src
Committed By: mrg
Date: Tue Apr 16 08:08:18 UTC 2019
Modified Files:
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
Log Message:
fix -I paths for powerpc*. convert amd64 specific hack.
we've been building dp-bit.c and fp-bit.c backwards, but as they
use the same input source, they just had opposite objects and
the right total was provided. oops.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
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.41 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.42
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.41 Wed Apr 3 02:13:56 2019
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Tue Apr 16 08:08:18 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.41 2019/04/03 02:13:56 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.42 2019/04/16 08:08:18 mrg Exp $
LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
+GCC_MACHINE_SUBDIR=${MACHINE_CPU:C/powerpc.*/rs6000/:C/x86_64/i386/}
.if ${MKGCC} != "no"
.if exists(${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/defs.mk)
@@ -22,11 +23,7 @@ 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
-.if ${LIBGCC_MACHINE_ARCH} == "x86_64"
-CPPFLAGS+= -I${DIST}/libgcc/config/i386
-.else
-CPPFLAGS+= -I${DIST}/libgcc/config/${LIBGCC_MACHINE_ARCH}
-.endif
+CPPFLAGS+= -I${DIST}/libgcc/config/${GCC_MACHINE_SUBDIR}
CPPFLAGS+= -I${DIST}/gcc -I${DIST}/include -I.
CPPFLAGS+= ${G_INTERNAL_CFLAGS:M-DHAVE_CC_TLS}
@@ -120,7 +117,7 @@ LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T}
# from the list of files we create.
.if !empty(G_LIB1ASMFUNCS)
. for f in ${G_LIB1ASMFUNCS:=.S}
-. if !exists(${DIST}/libgcc/config/${MACHINE_CPU}/${f})
+. if !exists(${DIST}/libgcc/config/${GCC_MACHINE_SUBDIR}/${f})
LIB1ASMFUNCS+= ${f}
. endif
. endfor
@@ -184,16 +181,17 @@ ${G_LIB2_DIVMOD_FUNCS:=.pico}: $(.PREFIX
${_MKTARGET_COMPILE}
${COMPILE.c} ${CPICFLAGS} -fexceptions -fnon-call-exceptions ${COPTS.${.IMPSRC:T}} -o ${.TARGET} ${.IMPSRC}
+CPPFLAGS.fp-bit.c+= -DFLOAT=1
dp-bit.c: ${.CURDIR}/Makefile
${_MKTARGET_CREATE}
- printf '#define FLOAT\n#include <fp-bit.c>\n' >${.TARGET}
+ printf '#include <fp-bit.c>\n' >${.TARGET}
#
# Common rules.
#
.PATH: ${DIST}/gcc ${DIST}/gcc/cp ${DIST}/gcc/cp/inc ${DIST}/gcc/config \
- ${DIST}/libgcc/config ${DIST}/libgcc/config/${MACHINE_CPU} \
+ ${DIST}/libgcc/config ${DIST}/libgcc/config/${GCC_MACHINE_SUBDIR} \
${G_LIB2ADD:H:O:u} ${G_LIB2ADDEH:H:O:u} ${GCCARCHLIBGCC}
.include "../Makefile.tconfigh"
