Module Name: src
Committed By: matt
Date: Wed Dec 18 18:41:40 UTC 2013
Modified Files:
src/gnu/lib/crtstuff4 [matt-nb5-mips64]: Makefile
src/gnu/lib/libbfd [matt-nb5-mips64]: Makefile
src/gnu/lib/libgcc4 [matt-nb5-mips64]: Makefile.inc
src/gnu/lib/libiberty [matt-nb5-mips64]: Makefile
src/gnu/lib/libobjc4 [matt-nb5-mips64]: Makefile
src/gnu/lib/libopcodes [matt-nb5-mips64]: Makefile
src/gnu/lib/libstdc++-v3_4 [matt-nb5-mips64]: Makefile
src/gnu/lib/libstdc++-v3_4/include [matt-nb5-mips64]: Makefile
src/gnu/lib/libstdc++-v3_4/include/backward [matt-nb5-mips64]: Makefile
src/gnu/lib/libstdc++-v3_4/include/bits [matt-nb5-mips64]: Makefile
src/gnu/lib/libstdc++-v3_4/include/debug [matt-nb5-mips64]: Makefile
src/gnu/lib/libstdc++-v3_4/include/ext [matt-nb5-mips64]: Makefile
src/gnu/lib/libstdc++-v3_4/include/tr1 [matt-nb5-mips64]: Makefile
src/gnu/lib/libsupc++4 [matt-nb5-mips64]: Makefile
Added Files:
src/gnu/lib [matt-nb5-mips64]: Makefile.inc
Log Message:
Treat MACHINE_ARCH of armv7/armv7eb as arm/armeb
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/gnu/lib/Makefile.inc
cvs rdiff -u -r1.3.10.1 -r1.3.10.2 src/gnu/lib/crtstuff4/Makefile
cvs rdiff -u -r1.45 -r1.45.6.1 src/gnu/lib/libbfd/Makefile
cvs rdiff -u -r1.13.10.1 -r1.13.10.2 src/gnu/lib/libgcc4/Makefile.inc
cvs rdiff -u -r1.10 -r1.10.30.1 src/gnu/lib/libiberty/Makefile
cvs rdiff -u -r1.11 -r1.11.6.1 src/gnu/lib/libobjc4/Makefile
cvs rdiff -u -r1.5 -r1.5.6.1 src/gnu/lib/libopcodes/Makefile
cvs rdiff -u -r1.3 -r1.3.28.1 src/gnu/lib/libstdc++-v3_4/Makefile
cvs rdiff -u -r1.1 -r1.1.32.1 src/gnu/lib/libstdc++-v3_4/include/Makefile
cvs rdiff -u -r1.1 -r1.1.32.1 \
src/gnu/lib/libstdc++-v3_4/include/backward/Makefile
cvs rdiff -u -r1.1 -r1.1.32.1 \
src/gnu/lib/libstdc++-v3_4/include/bits/Makefile
cvs rdiff -u -r1.1 -r1.1.32.1 \
src/gnu/lib/libstdc++-v3_4/include/debug/Makefile
cvs rdiff -u -r1.1 -r1.1.32.1 src/gnu/lib/libstdc++-v3_4/include/ext/Makefile
cvs rdiff -u -r1.1 -r1.1.32.1 src/gnu/lib/libstdc++-v3_4/include/tr1/Makefile
cvs rdiff -u -r1.2 -r1.2.28.1 src/gnu/lib/libsupc++4/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/lib/crtstuff4/Makefile
diff -u src/gnu/lib/crtstuff4/Makefile:1.3.10.1 src/gnu/lib/crtstuff4/Makefile:1.3.10.2
--- src/gnu/lib/crtstuff4/Makefile:1.3.10.1 Tue Dec 22 04:51:26 2009
+++ src/gnu/lib/crtstuff4/Makefile Wed Dec 18 18:41:39 2013
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile,v 1.3.10.1 2009/12/22 04:51:26 mrg Exp $
+# $NetBSD: Makefile,v 1.3.10.2 2013/12/18 18:41:39 matt Exp $
REQUIRETOOLS= yes
NOLINT= # defined
.include <bsd.own.mk>
+CRT_MACHINE_ARCH?=${MACHINE_ARCH:S/armv7/arm/}
+
# If using an external toolchain, we expect crtbegin/crtend to be
# supplied by that toolchain's run-time support.
.if !defined(EXTERNAL_TOOLCHAIN) && ${MKGCC} != "no" && ${OBJECT_FMT} == "ELF"
DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
GNUHOSTDIST= ${DIST}
-GCCARCH= ${NETBSDSRCDIR}/gnu/usr.bin/gcc4/arch/${MACHINE_ARCH}
+GCCARCH= ${NETBSDSRCDIR}/gnu/usr.bin/gcc4/arch/${CRT_MACHINE_ARCH}
GALLCFLAGS= ${G_CRTSTUFF_CFLAGS} ${G_CRTSTUFF_T_CFLAGS}
@@ -20,10 +22,10 @@ CPPFLAGS+= -I.
GCFLAGS= ${GALLCFLAGS:N-D*:N-I*:N-i*:N./*}
-DPSRCS+= ${.CURDIR}/arch/${MACHINE_ARCH}.mk tconfig.h
+DPSRCS+= ${.CURDIR}/arch/${CRT_MACHINE_ARCH}.mk tconfig.h
CLEANFILES+= cs-tconfig.h tconfig.h
-.include "${.CURDIR}/arch/${MACHINE_ARCH}.mk"
+.include "${.CURDIR}/arch/${CRT_MACHINE_ARCH}.mk"
SRCS+= crtbegin.c crtend.c
OBJS+= crtbegin.o crtend.o
@@ -66,7 +68,7 @@ ${OBJS}: ${DPSRCS}
${CC} ${CPPFLAGS} ${GCFLAGS} ${CPUFLAGS} -c ${.IMPSRC} -o ${.TARGET}.o
mv ${.TARGET}.o ${.TARGET}
-.if (${MACHINE_ARCH} == "mips64eb") || (${MACHINE_ARCH} == "mips64el")
+.if (${CRT_MACHINE_ARCH} == "mips64eb") || (${CRT_MACHINE_ARCH} == "mips64el")
# Turn off as(1) warnings on MIPS, since warnings are fatal with WARNS>0
# and GCC configury passes -finhibit-size-directive which causes mips-gas
# to barf. Don't know what the real fix for this is...
Index: src/gnu/lib/libbfd/Makefile
diff -u src/gnu/lib/libbfd/Makefile:1.45 src/gnu/lib/libbfd/Makefile:1.45.6.1
--- src/gnu/lib/libbfd/Makefile:1.45 Sat Oct 25 23:56:02 2008
+++ src/gnu/lib/libbfd/Makefile Wed Dec 18 18:41:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2008/10/25 23:56:02 mrg Exp $
+# $NetBSD: Makefile,v 1.45.6.1 2013/12/18 18:41:39 matt Exp $
NOLINKLIB= # defined
NOLINT= # defined
@@ -17,7 +17,7 @@ libinstall: # do nothing
LIB= bfd
-BFD_MACHINE_ARCH?= ${MACHINE_ARCH}
+BFD_MACHINE_ARCH?= ${MACHINE_ARCH:S/armv7/arm/}
.if exists(${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk)
.include "${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk"
Index: src/gnu/lib/libgcc4/Makefile.inc
diff -u src/gnu/lib/libgcc4/Makefile.inc:1.13.10.1 src/gnu/lib/libgcc4/Makefile.inc:1.13.10.2
--- src/gnu/lib/libgcc4/Makefile.inc:1.13.10.1 Sat Sep 5 03:51:16 2009
+++ src/gnu/lib/libgcc4/Makefile.inc Wed Dec 18 18:41:39 2013
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile.inc,v 1.13.10.1 2009/09/05 03:51:16 matt Exp $
+# $NetBSD: Makefile.inc,v 1.13.10.2 2013/12/18 18:41:39 matt Exp $
-.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk) && ${MKGCC} != "no"
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}.mk"
+.include "${.CURDIR}/../../Makefile.inc"
+.if exists(${.CURDIR}/../arch/${GCC_MACHINE_ARCH}.mk) && ${MKGCC} != "no"
+.include "${.CURDIR}/../arch/${GCC_MACHINE_ARCH}.mk"
.endif
DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
GNUHOSTDIST= ${DIST}
-GCCARCH= ${NETBSDSRCDIR}/gnu/usr.bin/gcc4/arch/${MACHINE_ARCH}
-GCCARCHLIBGCC= ${NETBSDSRCDIR}/gnu/lib/libgcc4/arch/${MACHINE_ARCH}
-GCCARCHXX= ${NETBSDSRCDIR}/gnu/lib/libstdc++-v3_4/arch/${MACHINE_ARCH}
+GCCARCH= ${NETBSDSRCDIR}/gnu/usr.bin/gcc4/arch/${GCC_MACHINE_ARCH}
+GCCARCHLIBGCC= ${NETBSDSRCDIR}/gnu/lib/libgcc4/arch/${GCC_MACHINE_ARCH}
+GCCARCHXX= ${NETBSDSRCDIR}/gnu/lib/libstdc++-v3_4/arch/${GCC_MACHINE_ARCH}
GCPPFLAGS= ${G_LIBGCC2_CFLAGS} ${G_USE_COLLECT2} ${G_INCLUDES}
CPPFLAGS+= -I${.CURDIR} -I${GCCARCHLIBGCC}
@@ -31,7 +32,7 @@ LIB2FUNCS_ALL= _muldi3 _negdi2 _lshrdi3
LIB2FUNCS_ALL+= _fixunssfsi _fixunsdfsi
.endif
-.if ${MACHINE_ARCH} != "vax"
+.if ${GCC_MACHINE_ARCH} != "vax"
LIB2FUNCS_ALL+= \
_mulsc3 _muldc3 _mulxc3 _multc3 _divsc3 _divdc3 _divxc3 _divtc3
.endif
@@ -51,7 +52,7 @@ LIB2_EH= ${G_LIB2ADDEH:M*.c:T}
LIB1ASMFUNCS= ${G_LIB1ASMFUNCS:=.S}
.endif
-DPSRCS+= ${.CURDIR}/../arch/${MACHINE_ARCH}.mk tconfig.h
+DPSRCS+= ${.CURDIR}/../arch/${GCC_MACHINE_ARCH}.mk tconfig.h
CLEANFILES+= ${LIB2FUNCS} ${LIB2FUNCS_ST} ${LIB2DIVMOD} cs-tconfig.h \
tconfig.h
.if !empty(G_LIB1ASMFUNCS)
@@ -63,7 +64,7 @@ BUILDSYMLINKS+= ${file} ${file:T:S/.asm$
.endfor
# XXX
-.if ${MACHINE_ARCH} == "m68000"
+.if ${GCC_MACHINE_ARCH} == "m68000"
CPICFLAGS:=
COMPILE.S= ${CC} ${AFLAGS} ${CPPFLAGS} -c
_TRADITIONAL_CPP=
@@ -72,14 +73,14 @@ BUILDSYMLINKS+= ${DIST}/gcc/config/m68k/
CPPFLAGS.xfgnulib.c+=-DEXTFLOAT=1
.endif
-.if ${MACHINE_ARCH} == "powerpc" || \
- ${MACHINE_ARCH} == "sh3el" || \
- ${MACHINE_ARCH} == "sh3eb"
+.if ${GCC_MACHINE_ARCH} == "powerpc" || \
+ ${GCC_MACHINE_ARCH} == "sh3el" || \
+ ${GCC_MACHINE_ARCH} == "sh3eb"
_TRADITIONAL_CPP=
COMPILE.S= ${CC} ${AFLAGS} ${CPPFLAGS} -c
.endif
-.if ${MACHINE_ARCH} == "powerpc64"
+.if ${GCC_MACHINE_ARCH} == "powerpc64"
COPTS+= -mlong-double-128
.endif
Index: src/gnu/lib/libiberty/Makefile
diff -u src/gnu/lib/libiberty/Makefile:1.10 src/gnu/lib/libiberty/Makefile:1.10.30.1
--- src/gnu/lib/libiberty/Makefile:1.10 Thu Nov 9 20:07:14 2006
+++ src/gnu/lib/libiberty/Makefile Wed Dec 18 18:41:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/11/09 20:07:14 christos Exp $
+# $NetBSD: Makefile,v 1.10.30.1 2013/12/18 18:41:39 matt Exp $
NOLINT= # defined
NOPROFILE= # defined
@@ -9,7 +9,7 @@ NOLINKLIB= # defined
LIB= iberty
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/arch/${MACHINE_ARCH:S/armv7/arm/}/defs.mk"
COPTS.argv.c = -Wno-stack-protector
COPTS.cp-demangle.c = -Wno-stack-protector
Index: src/gnu/lib/libobjc4/Makefile
diff -u src/gnu/lib/libobjc4/Makefile:1.11 src/gnu/lib/libobjc4/Makefile:1.11.6.1
--- src/gnu/lib/libobjc4/Makefile:1.11 Sun Oct 19 22:05:20 2008
+++ src/gnu/lib/libobjc4/Makefile Wed Dec 18 18:41:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/10/19 22:05:20 apb Exp $
+# $NetBSD: Makefile,v 1.11.6.1 2013/12/18 18:41:39 matt Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -7,15 +7,17 @@ NOLINT= # defined
LIB= objc
+.include "${.CURDIR}/../Makefile.inc"
+
.if ${MKGCC} != "no"
SHLIB_MAJOR= 2
SHLIB_MINOR= 1
# XXX just while all platforms defs.mk are updated..
-.if exists(${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk)
+.if exists(${.CURDIR}/arch/${GCC_MACHINE_ARCH}/defs.mk)
# Machine-dependent definitions (include file names).
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/arch/${GCC_MACHINE_ARCH}/defs.mk"
EXTRA_FAKEHEADERS=
.else
# Machine-independent definitions (include file names).
@@ -27,18 +29,18 @@ LIBGCCOBJ!= cd ${.CURDIR}/../libgcc4/
DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
GNUHOSTDIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
-GCCARCH= ${NETBSDSRCDIR}/gnu/usr.bin/gcc4/arch/${MACHINE_ARCH}
-LIBOBJCARCH= ${NETBSDSRCDIR}/gnu/lib/libobjc4/arch/${MACHINE_ARCH}
-GCCLIBXX= ${NETBSDSRCDIR}/gnu/lib/libstdc++-v3_4/arch/${MACHINE_ARCH}
+GCCARCH= ${NETBSDSRCDIR}/gnu/usr.bin/gcc4/arch/${GCC_MACHINE_ARCH}
+LIBOBJCARCH= ${NETBSDSRCDIR}/gnu/lib/libobjc4/arch/${GCC_MACHINE_ARCH}
+GCCLIBXX= ${NETBSDSRCDIR}/gnu/lib/libstdc++-v3_4/arch/${GCC_MACHINE_ARCH}
SRCS= ${G_OBJS:N[A-Z]*:Nlinking.lo:.lo=.c} ${G_OBJS:M[A-Z]*:.lo=.m} linking.m
GCPPFLAGS= ${G_ALL_CFLAGS} ${G_INCLUDES}
-CPPFLAGS+= -I. -I${.CURDIR}/arch/${MACHINE_ARCH}
+CPPFLAGS+= -I. -I${.CURDIR}/arch/${GCC_MACHINE_ARCH}
CPPFLAGS+= -I${GCCARCH} ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*}
CPPFLAGS+= -I${GCCLIBXX}
-BUILDSYMLINKS= ${.CURDIR}/../libstdc++-v3_4/arch/${MACHINE_ARCH} bits
+BUILDSYMLINKS= ${.CURDIR}/../libstdc++-v3_4/arch/${GCC_MACHINE_ARCH} bits
DPSRCS+= bits
.for f in Protocol.m Object.m NXConstStr.m linking.m
@@ -95,7 +97,7 @@ unwind.h: ${G_UNWIND_H}
CLEANFILES+= cs-tconfig.h tconfig.h unwind.h
# XXX just while all platforms defs.mk are updated..
-.if exists(${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk)
+.if exists(${.CURDIR}/arch/${GCC_MACHINE_ARCH}/defs.mk)
optionlist: ${G_ALL_OPT_FILES} ${LIBOBJCARCH}/defs.mk Makefile ${DIST}/gcc/opt-gather.awk
${TOOL_AWK} -f ${DIST}/gcc/opt-gather.awk ${G_ALL_OPT_FILES} \
> ${.TARGET}
Index: src/gnu/lib/libopcodes/Makefile
diff -u src/gnu/lib/libopcodes/Makefile:1.5 src/gnu/lib/libopcodes/Makefile:1.5.6.1
--- src/gnu/lib/libopcodes/Makefile:1.5 Sat Oct 25 23:56:02 2008
+++ src/gnu/lib/libopcodes/Makefile Wed Dec 18 18:41:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/10/25 23:56:02 mrg Exp $
+# $NetBSD: Makefile,v 1.5.6.1 2013/12/18 18:41:39 matt Exp $
NOLINKLIB= # defined
NOLINT= # defined
@@ -9,7 +9,7 @@ NOPROFILE= # defined
LIB= opcodes
-BFD_MACHINE_ARCH?= ${MACHINE_ARCH}
+BFD_MACHINE_ARCH?= ${MACHINE_ARCH:S/armv7/arm/}
.if exists(${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk)
.include "${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk"
Index: src/gnu/lib/libstdc++-v3_4/Makefile
diff -u src/gnu/lib/libstdc++-v3_4/Makefile:1.3 src/gnu/lib/libstdc++-v3_4/Makefile:1.3.28.1
--- src/gnu/lib/libstdc++-v3_4/Makefile:1.3 Thu Nov 9 20:07:15 2006
+++ src/gnu/lib/libstdc++-v3_4/Makefile Wed Dec 18 18:41:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/11/09 20:07:15 christos Exp $
+# $NetBSD: Makefile,v 1.3.28.1 2013/12/18 18:41:39 matt Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -7,8 +7,9 @@ NOLINT= # defined
LIB= stdc++
-.if exists(${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk) && ${MKGCC} != "no"
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../Makefile.inc"
+.if exists(${.CURDIR}/arch/${GCC_MACHINE_ARCH}/defs.mk) && ${MKGCC} != "no"
+.include "${.CURDIR}/arch/${GCC_MACHINE_ARCH}/defs.mk"
SHLIB_MAJOR= 6
SHLIB_MINOR= 0
@@ -120,9 +121,9 @@ CLEANFILES+= unwind.h
${DIST}/libstdc++-v3/libsupc++ \
${DIST}/libiberty \
${CONF}/locale/generic \
- ${.CURDIR}/arch/${MACHINE_ARCH}
+ ${.CURDIR}/arch/${GCC_MACHINE_ARCH}
-${OBJS}: ${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk
+${OBJS}: ${.CURDIR}/arch/${GCC_MACHINE_ARCH}/defs.mk
.else
.include <bsd.prog.mk> # do nothing
.endif
Index: src/gnu/lib/libstdc++-v3_4/include/Makefile
diff -u src/gnu/lib/libstdc++-v3_4/include/Makefile:1.1 src/gnu/lib/libstdc++-v3_4/include/Makefile:1.1.32.1
--- src/gnu/lib/libstdc++-v3_4/include/Makefile:1.1 Wed May 10 22:53:50 2006
+++ src/gnu/lib/libstdc++-v3_4/include/Makefile Wed Dec 18 18:41:39 2013
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2006/05/10 22:53:50 mrg Exp $
+# $NetBSD: Makefile,v 1.1.32.1 2013/12/18 18:41:39 matt Exp $
SUBDIR= backward ext bits debug tr1
#SUBDIR+= pb_assoc
.include <bsd.own.mk>
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../../Makefile.inc"
+.include "${.CURDIR}/../arch/${GCC_MACHINE_ARCH}/defs.mk"
.cc: # disable .cc->NULL transform
Index: src/gnu/lib/libstdc++-v3_4/include/backward/Makefile
diff -u src/gnu/lib/libstdc++-v3_4/include/backward/Makefile:1.1 src/gnu/lib/libstdc++-v3_4/include/backward/Makefile:1.1.32.1
--- src/gnu/lib/libstdc++-v3_4/include/backward/Makefile:1.1 Wed May 10 22:53:50 2006
+++ src/gnu/lib/libstdc++-v3_4/include/backward/Makefile Wed Dec 18 18:41:39 2013
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2006/05/10 22:53:50 mrg Exp $
+# $NetBSD: Makefile,v 1.1.32.1 2013/12/18 18:41:39 matt Exp $
.include <bsd.own.mk>
-.include "${.CURDIR}/../../arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../../../Makefile.inc"
+.include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
.cc: # disable .cc->NULL transform
Index: src/gnu/lib/libstdc++-v3_4/include/bits/Makefile
diff -u src/gnu/lib/libstdc++-v3_4/include/bits/Makefile:1.1 src/gnu/lib/libstdc++-v3_4/include/bits/Makefile:1.1.32.1
--- src/gnu/lib/libstdc++-v3_4/include/bits/Makefile:1.1 Wed May 10 22:53:50 2006
+++ src/gnu/lib/libstdc++-v3_4/include/bits/Makefile Wed Dec 18 18:41:39 2013
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2006/05/10 22:53:50 mrg Exp $
+# $NetBSD: Makefile,v 1.1.32.1 2013/12/18 18:41:39 matt Exp $
.include <bsd.own.mk>
-.include "${.CURDIR}/../../arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../../../Makefile.inc"
+.include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
.cc: # disable .cc->NULL transform
@@ -25,9 +26,9 @@ c++locale.h: ${CONF}/locale/generic/c_lo
# mknative?
BITS_CPUDIR.sparc64=sparc
-_DIR=${BITS_CPUDIR.${MACHINE_ARCH}}
+_DIR=${BITS_CPUDIR.${GCC_MACHINE_ARCH}}
.if ${_DIR} != ""
-BITS_CPUDIR=${BITS_CPUDIR.${MACHINE_ARCH}}
+BITS_CPUDIR=${BITS_CPUDIR.${GCC_MACHINE_ARCH}}
.else
BITS_CPUDIR=${MACHINE_GNU_ARCH}
.endif
@@ -39,7 +40,7 @@ BITS_CPUDIR=${MACHINE_GNU_ARCH}
${CONF}/cpu/${BITS_CPUDIR} \
${CONF}/cpu/generic \
${CONF}/locale/generic \
- ${.CURDIR}/../../arch/${MACHINE_ARCH}
+ ${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}
# Get default targets including <bsd.inc.mk>.
.include <bsd.prog.mk>
Index: src/gnu/lib/libstdc++-v3_4/include/debug/Makefile
diff -u src/gnu/lib/libstdc++-v3_4/include/debug/Makefile:1.1 src/gnu/lib/libstdc++-v3_4/include/debug/Makefile:1.1.32.1
--- src/gnu/lib/libstdc++-v3_4/include/debug/Makefile:1.1 Wed May 10 22:53:50 2006
+++ src/gnu/lib/libstdc++-v3_4/include/debug/Makefile Wed Dec 18 18:41:40 2013
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2006/05/10 22:53:50 mrg Exp $
+# $NetBSD: Makefile,v 1.1.32.1 2013/12/18 18:41:40 matt Exp $
.include <bsd.own.mk>
-.include "${.CURDIR}/../../arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../../../Makefile.inc"
+.include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
.cc: # disable .cc->NULL transform
Index: src/gnu/lib/libstdc++-v3_4/include/ext/Makefile
diff -u src/gnu/lib/libstdc++-v3_4/include/ext/Makefile:1.1 src/gnu/lib/libstdc++-v3_4/include/ext/Makefile:1.1.32.1
--- src/gnu/lib/libstdc++-v3_4/include/ext/Makefile:1.1 Wed May 10 22:53:51 2006
+++ src/gnu/lib/libstdc++-v3_4/include/ext/Makefile Wed Dec 18 18:41:40 2013
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2006/05/10 22:53:51 mrg Exp $
+# $NetBSD: Makefile,v 1.1.32.1 2013/12/18 18:41:40 matt Exp $
.include <bsd.own.mk>
-.include "${.CURDIR}/../../arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../../../Makefile.inc"
+.include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
.cc: # disable .cc->NULL transform
Index: src/gnu/lib/libstdc++-v3_4/include/tr1/Makefile
diff -u src/gnu/lib/libstdc++-v3_4/include/tr1/Makefile:1.1 src/gnu/lib/libstdc++-v3_4/include/tr1/Makefile:1.1.32.1
--- src/gnu/lib/libstdc++-v3_4/include/tr1/Makefile:1.1 Wed May 10 22:53:51 2006
+++ src/gnu/lib/libstdc++-v3_4/include/tr1/Makefile Wed Dec 18 18:41:40 2013
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2006/05/10 22:53:51 mrg Exp $
+# $NetBSD: Makefile,v 1.1.32.1 2013/12/18 18:41:40 matt Exp $
.include <bsd.own.mk>
-.include "${.CURDIR}/../../arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../../../Makefile.inc"
+.include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
.cc: # disable .cc->NULL transform
Index: src/gnu/lib/libsupc++4/Makefile
diff -u src/gnu/lib/libsupc++4/Makefile:1.2 src/gnu/lib/libsupc++4/Makefile:1.2.28.1
--- src/gnu/lib/libsupc++4/Makefile:1.2 Thu Nov 9 20:07:15 2006
+++ src/gnu/lib/libsupc++4/Makefile Wed Dec 18 18:41:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/11/09 20:07:15 christos Exp $
+# $NetBSD: Makefile,v 1.2.28.1 2013/12/18 18:41:40 matt Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -9,8 +9,10 @@ NOPROFILE= # defined
LIB= supc++
-.if exists(${.CURDIR}/../libstdc++-v3_4/arch/${MACHINE_ARCH}/defs.mk) && ${MKGCC} != "no"
-.include "${.CURDIR}/../libstdc++-v3_4/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../Makefile.inc"
+
+.if exists(${.CURDIR}/../libstdc++-v3_4/arch/${GCC_MACHINE_ARCH}/defs.mk) && ${MKGCC} != "no"
+.include "${.CURDIR}/../libstdc++-v3_4/arch/${GCC_MACHINE_ARCH}/defs.mk"
SHLIB_MAJOR= 0
SHLIB_MINOR= 0
@@ -35,9 +37,9 @@ CLEANFILES+= unwind.h
${DIST}/libstdc++-v3/libmath \
${DIST}/libstdc++-v3/libsupc++ \
${DIST}/libiberty \
- ${.CURDIR}/../libstdc++-v3_4/arch/${MACHINE_ARCH}
+ ${.CURDIR}/../libstdc++-v3_4/arch/${GCC_MACHINE_ARCH}
-${OBJS}: ${.CURDIR}/../libstdc++-v3_4/arch/${MACHINE_ARCH}/defs.mk
+${OBJS}: ${.CURDIR}/../libstdc++-v3_4/arch/${GCC_MACHINE_ARCH}/defs.mk
.else
.include <bsd.prog.mk> # do nothing
.endif
Added files:
Index: src/gnu/lib/Makefile.inc
diff -u /dev/null src/gnu/lib/Makefile.inc:1.1.2.1
--- /dev/null Wed Dec 18 18:41:40 2013
+++ src/gnu/lib/Makefile.inc Wed Dec 18 18:41:39 2013
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1.2.1 2013/12/18 18:41:39 matt Exp $
+
+GCC_MACHINE_ARCH=${MACHINE_ARCH:S/armv7/arm/}
