Module Name: src
Committed By: matt
Date: Thu Aug 22 00:17:48 UTC 2013
Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile Makefile.inc
src/external/gpl3/gcc/usr.bin/backend: Makefile
src/external/gpl3/gcc/usr.bin/cpp: Makefile
src/external/gpl3/gcc/usr.bin/frontend: Makefile
src/external/gpl3/gcc/usr.bin/include: Makefile
src/external/gpl3/gcc/usr.bin/libcpp: Makefile
src/external/gpl3/gcc/usr.bin/libdecnumber: Makefile
Log Message:
Add MACHINE_ARCH's evbearmv5-e[bl] to work
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/usr.bin/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/usr.bin/Makefile.inc
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/cpp/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/usr.bin/frontend/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/include/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/libcpp/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/libdecnumber/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/usr.bin/Makefile
diff -u src/external/gpl3/gcc/usr.bin/Makefile:1.3 src/external/gpl3/gcc/usr.bin/Makefile:1.4
--- src/external/gpl3/gcc/usr.bin/Makefile:1.3 Wed Jun 29 01:57:59 2011
+++ src/external/gpl3/gcc/usr.bin/Makefile Thu Aug 22 00:17:48 2013
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2011/06/29 01:57:59 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2013/08/22 00:17:48 matt Exp $
NOOBJ=# defined
.include <bsd.own.mk>
-.if ${MKGCC} != "no" && exists(${.CURDIR}/gcc/arch/${MACHINE_ARCH}/defs.mk)
+GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/}
+
+.if ${MKGCC} != "no" && exists(${.CURDIR}/gcc/arch/${GCC_MACHINE_ARCH}/defs.mk)
# We keep libcpp here since it depends upon frontend.
Index: src/external/gpl3/gcc/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc/usr.bin/Makefile.inc:1.14 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.15
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.14 Tue Aug 6 05:36:42 2013
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc Thu Aug 22 00:17:48 2013
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile.inc,v 1.14 2013/08/06 05:36:42 matt Exp $
+# $NetBSD: Makefile.inc,v 1.15 2013/08/22 00:17:48 matt Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
.include <bsd.own.mk>
+GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/}
GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
TOP= ${NETBSDSRCDIR}
DIST= ${TOP}/external/gpl3/gcc/dist
-GCCARCH= ${.CURDIR}/../gcc/arch/${MACHINE_ARCH}
+GCCARCH= ${.CURDIR}/../gcc/arch/${GCC_MACHINE_ARCH}
CPPFLAGS+= -DLOCALEDIR=\"/usr/share/locale\" -DNETBSD_NATIVE
HOST_CPPFLAGS+= -I${.CURDIR}/..
Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.17 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.18
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.17 Fri May 24 16:37:32 2013
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Thu Aug 22 00:17:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2013/05/24 16:37:32 christos Exp $
+# $NetBSD: Makefile,v 1.18 2013/08/22 00:17:48 matt Exp $
LIBISPRIVATE= yes
@@ -97,10 +97,10 @@ gtype-desc.c: gtype-desc.h
gtype-desc.h: gengtype gtyp-input.list.tmp
${_MKTARGET_CREATE}
rm -f auto-host.h
- ln -s ${.CURDIR}/../gcc/arch/${MACHINE_ARCH}/auto-host.h .
- if [ -f ${.CURDIR}/../gcc/arch/${MACHINE_ARCH}/sysroot-suffix.h ]; then \
+ ln -s ${.CURDIR}/../gcc/arch/${GCC_MACHINE_ARCH}/auto-host.h .
+ if [ -f ${.CURDIR}/../gcc/arch/${GCC_MACHINE_ARCH}/sysroot-suffix.h ]; then \
rm -f sysroot-suffix.h; \
- ln -s ${.CURDIR}/../gcc/arch/${MACHINE_ARCH}/sysroot-suffix.h ; \
+ ln -s ${.CURDIR}/../gcc/arch/${GCC_MACHINE_ARCH}/sysroot-suffix.h ; \
fi
./gengtype ${DIST}/gcc gtyp-input.list.tmp
# gengtype is the real need for options.h
@@ -307,7 +307,7 @@ vec.lo: gtype-desc.h
gtype-desc.d gtype-desc.o: insn-constants.h
insn-emit.d insn-emit.o: tm-constrs.h
-.if ${MACHINE_ARCH} == "alpha"
+.if ${GCC_MACHINE_ARCH} == "alpha"
alpha.d alpha.o: tm-constrs.h tm_p.h
.endif
@@ -315,13 +315,13 @@ alpha.d alpha.o: tm-constrs.h tm_p.h
arm.d arm.o: insn-constants.h tm_p.h
.endif
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.if ${GCC_MACHINE_ARCH} == "i386" || ${GCC_MACHINE_ARCH} == "x86_64"
i386.d i386.o: tm-constrs.h
.endif
CFLAGS+= -Wno-stack-protector
-.if ${MACHINE_ARCH} == "m68000" || ${MACHINE_ARCH} == "m68k"
+.if ${GCC_MACHINE_ARCH} == "m68000" || ${GCC_MACHINE_ARCH} == "m68k"
COPTS.lambda-code.c= -O0
COPTS.tree-loop-linear.c= -O0
.endif
Index: src/external/gpl3/gcc/usr.bin/cpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.4 src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.5
--- src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.4 Tue Jul 19 15:59:02 2011
+++ src/external/gpl3/gcc/usr.bin/cpp/Makefile Thu Aug 22 00:17:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/07/19 15:59:02 tron Exp $
+# $NetBSD: Makefile,v 1.5 2013/08/22 00:17:48 matt Exp $
# For ../Makefile.inc and bsd.own.mk
.include <bsd.init.mk>
@@ -7,11 +7,11 @@ PROG= cpp
SRCS= gcc.c cppspec.c prefix.c version.c
# XXX
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
+.if ${GCC_MACHINE_ARCH} == "x86_64" || ${GCC_MACHINE_ARCH} == "i386"
SRCS+= driver-i386.c
.PATH: ${DIST}/gcc/config/i386
.endif
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
+.if ${GCC_MACHINE_ARCH} == "powerpc" || ${GCC_MACHINE_ARCH} == "powerpc64"
SRCS+= driver-rs6000.c
.PATH: ${DIST}/gcc/config/rs6000
.endif
Index: src/external/gpl3/gcc/usr.bin/frontend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.5 src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.6
--- src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.5 Tue Jul 19 15:59:02 2011
+++ src/external/gpl3/gcc/usr.bin/frontend/Makefile Thu Aug 22 00:17:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/07/19 15:59:02 tron Exp $
+# $NetBSD: Makefile,v 1.6 2013/08/22 00:17:48 matt Exp $
LIBISPRIVATE= yes
@@ -10,11 +10,11 @@ LIB= frontend
SRCS= gcc.c version.c intl.c prefix.c opts-common.c gcc-options.c
# XXX
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
+.if ${GCC_MACHINE_ARCH} == "x86_64" || ${GCC_MACHINE_ARCH} == "i386"
SRCS+= driver-i386.c
.PATH: ${DIST}/gcc/config/i386
.endif
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
+.if ${GCC_MACHINE_ARCH} == "powerpc" || ${GCC_MACHINE_ARCH} == "powerpc64"
SRCS+= driver-rs6000.c
.PATH: ${DIST}/gcc/config/rs6000
.endif
Index: src/external/gpl3/gcc/usr.bin/include/Makefile
diff -u src/external/gpl3/gcc/usr.bin/include/Makefile:1.4 src/external/gpl3/gcc/usr.bin/include/Makefile:1.5
--- src/external/gpl3/gcc/usr.bin/include/Makefile:1.4 Thu Jul 7 08:46:20 2011
+++ src/external/gpl3/gcc/usr.bin/include/Makefile Thu Aug 22 00:17:48 2013
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.4 2011/07/07 08:46:20 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2013/08/22 00:17:48 matt Exp $
.include "../Makefile.inc"
# XXX for G_EXTRA_HEADERS. make mknative-gcc put that somewhere
# inside usr.bin/ not lib/
-.if exists(${.CURDIR}/../../lib/libgcc/arch/${MACHINE_ARCH}.mk)
-.include "${.CURDIR}/../../lib/libgcc/arch/${MACHINE_ARCH}.mk"
+.if exists(${.CURDIR}/../../lib/libgcc/arch/${GCC_MACHINE_ARCH}.mk)
+.include "${.CURDIR}/../../lib/libgcc/arch/${GCC_MACHINE_ARCH}.mk"
.endif
INCS= ${G_EXTRA_HEADERS:T}
# XXX missed some how
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.if ${GCC_MACHINE_ARCH} == "i386" || ${GCC_MACHINE_ARCH} == "x86_64"
INCS+= mm_malloc.h
# XXX we should put this in gcc/config.gcc and regenerate the i386/x86
Index: src/external/gpl3/gcc/usr.bin/libcpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.4 src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.5
--- src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.4 Tue Aug 13 19:29:45 2013
+++ src/external/gpl3/gcc/usr.bin/libcpp/Makefile Thu Aug 22 00:17:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/08/13 19:29:45 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2013/08/22 00:17:48 matt Exp $
LIBISPRIVATE= yes
@@ -6,7 +6,7 @@ LIB= cpp
SRCS= ${G_libcpp_a_OBJS:.o=.c}
-CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} \
+CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${GCC_MACHINE_ARCH} \
-I${GCCARCH} -I${BACKENDOBJ} -I. \
${G_INCLUDES:M-I*:N-I.*} \
-DPREFIX=\"/usr\"
Index: src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile
diff -u src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile:1.2 src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile:1.3
--- src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile:1.2 Wed Jun 29 02:15:34 2011
+++ src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile Thu Aug 22 00:17:48 2013
@@ -10,7 +10,7 @@ LIBISPRIVATE= yes
LIB= decnumber
SRCS= decNumber.c decContext.c decimal32.c decimal64.c decimal128.c
-CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH} -I${DIST}/libdecnumber
+CPPFLAGS+= -I${.CURDIR}/arch/${GCC_MACHINE_ARCH} -I${DIST}/libdecnumber
CPPFLAGS+= -I${DIST}/libgcc
.include <bsd.lib.mk>
