Module Name: src
Committed By: matt
Date: Thu Aug 22 00:16:54 UTC 2013
Modified Files:
src/external/gpl3/gcc/lib/libgcc: Makefile Makefile.inc Makefile.srcs
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
src/external/gpl3/gcc/lib/libgcc/libgcov: Makefile
src/external/gpl3/gcc/lib/libgomp: Makefile
src/external/gpl3/gcc/lib/libiberty: Makefile
src/external/gpl3/gcc/lib/libobjc: Makefile
Log Message:
Add MACHINE_ARCH's evbearmv5-e[bl] to work
Don't build _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 on earm and coldfire
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libgcc/Makefile \
src/external/gpl3/gcc/lib/libgcc/Makefile.srcs
cvs rdiff -u -r1.20 -r1.21 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/lib/libgcc/libgcov/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/lib/libgomp/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/lib/libiberty/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/lib/libobjc/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/lib/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile:1.1 src/external/gpl3/gcc/lib/libgcc/Makefile:1.2
--- src/external/gpl3/gcc/lib/libgcc/Makefile:1.1 Tue Jun 21 06:02:25 2011
+++ src/external/gpl3/gcc/lib/libgcc/Makefile Thu Aug 22 00:16:54 2013
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:25 mrg Exp $
-
-SUBDIR+= libgcc
+# $NetBSD: Makefile,v 1.2 2013/08/22 00:16:54 matt Exp $
.include <bsd.own.mk>
+SUBDIR+= libgcc
+
.if ${MKPIC} != "no"
SUBDIR+= libgcc_eh libgcc_s
.endif
Index: src/external/gpl3/gcc/lib/libgcc/Makefile.srcs
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.srcs:1.1 src/external/gpl3/gcc/lib/libgcc/Makefile.srcs:1.2
--- src/external/gpl3/gcc/lib/libgcc/Makefile.srcs:1.1 Tue Jun 21 06:02:25 2011
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.srcs Thu Aug 22 00:16:54 2013
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.srcs,v 1.1 2011/06/21 06:02:25 mrg Exp $
+# $NetBSD: Makefile.srcs,v 1.2 2013/08/22 00:16:54 matt Exp $
#
# Generated makefiles.
#
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/srcs.tmplsrcs.mk"
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/srcs.cppflags.mk"
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/srcs.copts.mk"
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk"
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplsrcs.mk"
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplfpsrcs.mk"
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplasmsrcs.mk"
+.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/srcs.tmplsrcs.mk"
+.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/srcs.cppflags.mk"
+.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/srcs.copts.mk"
+.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/libs.lib${LIB}.srcs.mk"
+.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplsrcs.mk"
+.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplfpsrcs.mk"
+.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplasmsrcs.mk"
Index: src/external/gpl3/gcc/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.20 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.21
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.20 Thu Jul 18 22:39:57 2013
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Thu Aug 22 00:16:54 2013
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.20 2013/07/18 22:39:57 matt Exp $
+# $NetBSD: Makefile.inc,v 1.21 2013/08/22 00:16:54 matt Exp $
.if ${MKGCC} != "no"
-LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH}
-#.info LIBGCC_MACHINE_ARCH=${LIBGCC_MACHINE_ARCH}
+LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
.if exists(${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}.mk)
.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}.mk"
.endif
@@ -46,7 +45,14 @@ LIB2FUNCS_ALL= \
_mulsc3 _muldc3 _mulxc3 _multc3 _divsc3 _divdc3 _divxc3 \
_divtc3 _bswapsi2 _bswapdi2
-.if ${MACHINE_ARCH} != "coldfire"
+.if ${LIBGCC_MACHINE_ARCH} != "coldfire" && empty(LIBGCC_MACHINE_ARCH:Mearm*)
+
+LIB2FUNCS_ALL+= \
+ _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3
+
+.endif
+
+.if ${LIBGCC_MACHINE_ARCH} != "coldfire" && empty(LIBGCC_MACHINE_ARCH:Mearm*)
# non swfloat versions
.for _p in _fix _fixuns
@@ -163,7 +169,7 @@ DPSRCS+= ${FAKEHEADERS}
CLEANFILES+= ${FAKEHEADERS}
# XXX arm hack
-.if ${MACHINE_CPU} == "arm"
+.if !empty(LIBGCC_MACHINE_ARCH:M*arm*)
${SRCS}: insn-modes.h
# XXX XXX
${__DPSRCS.d}: insn-modes.h
Index: src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.13 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.14
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.13 Tue Apr 30 02:28:16 2013
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Thu Aug 22 00:16:54 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/04/30 02:28:16 matt Exp $
+# $NetBSD: Makefile,v 1.14 2013/08/22 00:16:54 matt Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -11,6 +11,8 @@ LIB= gcc
.if ${MKGCC} != "no"
+.include <bsd.init.mk>
+
.cc: # disable .cc->NULL transform
# XXX handle this better?
@@ -23,7 +25,6 @@ SRCS+= ${LIB2FUNCS} ${LIB2FUNCS_ST} ${L
${G_LIB2ADD_HACK:T:S/.asm/.S/} ${G_LIB2ADD:T:S/.asm/.S/} \
${G_LIB2ADD_ST} ${LIB1ASMFUNCS}
.if ${MKPIC} == "no"
-LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH}
.if empty(LIBGCC_MACHINE_ARCH:Mearm*)
SRCS+= ${LIB2_EH} ${LIB2_EHASM}
.endif
Index: src/external/gpl3/gcc/lib/libgcc/libgcov/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcov/Makefile:1.4 src/external/gpl3/gcc/lib/libgcc/libgcov/Makefile:1.5
--- src/external/gpl3/gcc/lib/libgcc/libgcov/Makefile:1.4 Mon Apr 29 12:59:55 2013
+++ src/external/gpl3/gcc/lib/libgcc/libgcov/Makefile Thu Aug 22 00:16:54 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/04/29 12:59:55 skrll Exp $
+# $NetBSD: Makefile,v 1.5 2013/08/22 00:16:54 matt Exp $
REQUIRETOOLS= yes
NOPIC= # defined
@@ -8,17 +8,18 @@ NOLINT= # defined
LIB= gcov
.include <bsd.own.mk>
+.include <bsd.init.mk>
.if ${MKGCC} != "no"
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/arch/${LIBGCC_MACHINE_ARCH}/defs.mk"
LIBGCOVSRCS= ${G_LIBGCOV:=.c}
-CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH}
+CPPFLAGS+= -I${.CURDIR}/arch/${LIBGCC_MACHINE_ARCH}
CPPFLAGS+= -Wno-stack-protector
-DPSRCS+= ${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk
+DPSRCS+= ${.CURDIR}/arch/${LIBGCC_MACHINE_ARCH}/defs.mk
SRCS+= ${LIBGCOVSRCS}
CLEANFILES+= ${LIBGCOVSRCS}
Index: src/external/gpl3/gcc/lib/libgomp/Makefile
diff -u src/external/gpl3/gcc/lib/libgomp/Makefile:1.7 src/external/gpl3/gcc/lib/libgomp/Makefile:1.8
--- src/external/gpl3/gcc/lib/libgomp/Makefile:1.7 Thu Feb 23 11:05:02 2012
+++ src/external/gpl3/gcc/lib/libgomp/Makefile Thu Aug 22 00:16:54 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/02/23 11:05:02 nonaka Exp $
+# $NetBSD: Makefile,v 1.8 2013/08/22 00:16:54 matt Exp $
# build GCC's libgomp, so that -fopenmp works.
@@ -39,7 +39,7 @@ SRCS= \
fortran.c \
affinity.c
-GOMP_MACHINE_ARCH?= ${MACHINE_ARCH}
+GOMP_MACHINE_ARCH?= ${MACHINE_ARCH:S/earmv5/earm/}
ARCHDIR= ${.CURDIR}/arch/${GOMP_MACHINE_ARCH}
CPPFLAGS+= \
Index: src/external/gpl3/gcc/lib/libiberty/Makefile
diff -u src/external/gpl3/gcc/lib/libiberty/Makefile:1.3 src/external/gpl3/gcc/lib/libiberty/Makefile:1.4
--- src/external/gpl3/gcc/lib/libiberty/Makefile:1.3 Tue Aug 9 12:58:55 2011
+++ src/external/gpl3/gcc/lib/libiberty/Makefile Thu Aug 22 00:16:54 2013
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2011/08/09 12:58:55 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2013/08/22 00:16:54 matt Exp $
LIBISPRIVATE= yes
.include <bsd.own.mk>
+GCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
+
LIB= iberty
.include "${.CURDIR}/defs.mk"
@@ -14,7 +16,7 @@ GNUHOSTDIST= ${DIST}
SRCS= ${G_REQUIRED_OFILES:.o=.c} ${G_EXTRA_OFILES:.o=.c} \
${G_LIBOBJS:.o=.c} ${G_ALLOCA:.o=.c}
-CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/arch/${MACHINE_ARCH} \
+CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/arch/${GCC_MACHINE_ARCH} \
-I${DIST}/include
COPTS.argv.c = -Wno-stack-protector
Index: src/external/gpl3/gcc/lib/libobjc/Makefile
diff -u src/external/gpl3/gcc/lib/libobjc/Makefile:1.6 src/external/gpl3/gcc/lib/libobjc/Makefile:1.7
--- src/external/gpl3/gcc/lib/libobjc/Makefile:1.6 Fri Jul 1 10:04:36 2011
+++ src/external/gpl3/gcc/lib/libobjc/Makefile Thu Aug 22 00:16:54 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/07/01 10:04:36 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2013/08/22 00:16:54 matt Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -8,6 +8,7 @@ UNSUPPORTED_COMPILER.clang= # defined
.include <bsd.own.mk>
LIB= objc
+GCC_MACHINE_ARCH?= ${MACHINE_ARCH:S/earmv5/earm/}
.if ${MKGCC} != "no"
@@ -15,9 +16,9 @@ SHLIB_MAJOR= 3
SHLIB_MINOR= 0
# 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).
@@ -29,18 +30,18 @@ LIBGCCOBJ!= cd ${.CURDIR}/../libgcc/l
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
GNUHOSTDIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
-GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${MACHINE_ARCH}
-LIBOBJCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libobjc/arch/${MACHINE_ARCH}
-GCCLIBXX= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libstdc++-v3/arch/${MACHINE_ARCH}
+GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${GCC_MACHINE_ARCH}
+LIBOBJCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libobjc/arch/${GCC_MACHINE_ARCH}
+GCCLIBXX= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libstdc++-v3/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/arch/${MACHINE_ARCH} bits
+BUILDSYMLINKS= ${.CURDIR}/../libstdc++-v3/arch/${GCC_MACHINE_ARCH} bits
DPSRCS+= bits
.for f in Protocol.m Object.m NXConstStr.m linking.m
@@ -80,7 +81,7 @@ DPSRCS+= unwind.h
.include "../Makefile.hacks"
# 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}
