[src/trunk]: src/external/gpl3/gcc/lib Add MACHINE_ARCH's evbearmv5-e[bl] to ...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/external/gpl3/gcc/lib Add MACHINE_ARCH's evbearmv5-e[bl] to ...
From: matt <matt%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 01:12:28 +0000
details:   https://anonhg.NetBSD.org/src/rev/141a6c31e4e3
branches:  trunk
changeset: 789556:141a6c31e4e3
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Aug 22 00:16:54 2013 +0000

description:
Add MACHINE_ARCH's evbearmv5-e[bl] to work
Don't build _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 on earm and coldfire

diffstat:

 external/gpl3/gcc/lib/libgcc/Makefile         |   6 +++---
 external/gpl3/gcc/lib/libgcc/Makefile.inc     |  16 +++++++++++-----
 external/gpl3/gcc/lib/libgcc/Makefile.srcs    |  16 ++++++++--------
 external/gpl3/gcc/lib/libgcc/libgcc/Makefile  |   5 +++--
 external/gpl3/gcc/lib/libgcc/libgcov/Makefile |   9 +++++----
 external/gpl3/gcc/lib/libgomp/Makefile        |   4 ++--
 external/gpl3/gcc/lib/libiberty/Makefile      |   6 ++++--
 external/gpl3/gcc/lib/libobjc/Makefile        |  19 ++++++++++---------
 8 files changed, 46 insertions(+), 35 deletions(-)

diffs (242 lines):

diff -r 9a22009e857a -r 141a6c31e4e3 external/gpl3/gcc/lib/libgcc/Makefile
--- a/external/gpl3/gcc/lib/libgcc/Makefile     Thu Aug 22 00:13:00 2013 +0000
+++ b/external/gpl3/gcc/lib/libgcc/Makefile     Thu Aug 22 00:16:54 2013 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.1 2011/06/21 06:02:25 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2013/08/22 00:16:54 matt Exp $
+
+.include <bsd.own.mk>
 
 SUBDIR+=       libgcc
 
-.include <bsd.own.mk>
-
 .if ${MKPIC} != "no"
 SUBDIR+=       libgcc_eh libgcc_s
 .endif
diff -r 9a22009e857a -r 141a6c31e4e3 external/gpl3/gcc/lib/libgcc/Makefile.inc
--- a/external/gpl3/gcc/lib/libgcc/Makefile.inc Thu Aug 22 00:13:00 2013 +0000
+++ b/external/gpl3/gcc/lib/libgcc/Makefile.inc Thu Aug 22 00:16:54 2013 +0000
@@ -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 @@
        _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 @@
 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
diff -r 9a22009e857a -r 141a6c31e4e3 external/gpl3/gcc/lib/libgcc/Makefile.srcs
--- a/external/gpl3/gcc/lib/libgcc/Makefile.srcs        Thu Aug 22 00:13:00 2013 +0000
+++ b/external/gpl3/gcc/lib/libgcc/Makefile.srcs        Thu Aug 22 00:16:54 2013 +0000
@@ -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"
diff -r 9a22009e857a -r 141a6c31e4e3 external/gpl3/gcc/lib/libgcc/libgcc/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcc/Makefile      Thu Aug 22 00:13:00 2013 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc/Makefile      Thu Aug 22 00:16:54 2013 +0000
@@ -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 @@
 
 .if ${MKGCC} != "no"
 
+.include <bsd.init.mk>
+
 .cc: # disable .cc->NULL transform
 
 # XXX handle this better?
@@ -23,7 +25,6 @@
                ${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
diff -r 9a22009e857a -r 141a6c31e4e3 external/gpl3/gcc/lib/libgcc/libgcov/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcov/Makefile     Thu Aug 22 00:13:00 2013 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcov/Makefile     Thu Aug 22 00:16:54 2013 +0000
@@ -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 @@
 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}
diff -r 9a22009e857a -r 141a6c31e4e3 external/gpl3/gcc/lib/libgomp/Makefile
--- a/external/gpl3/gcc/lib/libgomp/Makefile    Thu Aug 22 00:13:00 2013 +0000
+++ b/external/gpl3/gcc/lib/libgomp/Makefile    Thu Aug 22 00:16:54 2013 +0000
@@ -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 @@
        fortran.c \
        affinity.c
 
-GOMP_MACHINE_ARCH?=    ${MACHINE_ARCH}
+GOMP_MACHINE_ARCH?=    ${MACHINE_ARCH:S/earmv5/earm/}
 ARCHDIR=               ${.CURDIR}/arch/${GOMP_MACHINE_ARCH}
 
 CPPFLAGS+= \
diff -r 9a22009e857a -r 141a6c31e4e3 external/gpl3/gcc/lib/libiberty/Makefile
--- a/external/gpl3/gcc/lib/libiberty/Makefile  Thu Aug 22 00:13:00 2013 +0000
+++ b/external/gpl3/gcc/lib/libiberty/Makefile  Thu Aug 22 00:16:54 2013 +0000
@@ -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 @@
 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
diff -r 9a22009e857a -r 141a6c31e4e3 external/gpl3/gcc/lib/libobjc/Makefile
--- a/external/gpl3/gcc/lib/libobjc/Makefile    Thu Aug 22 00:13:00 2013 +0000
+++ b/external/gpl3/gcc/lib/libobjc/Makefile    Thu Aug 22 00:16:54 2013 +0000
@@ -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 @@
 .include <bsd.own.mk>
 
 LIB=           objc
+GCC_MACHINE_ARCH?=     ${MACHINE_ARCH:S/earmv5/earm/}
 
 .if ${MKGCC} != "no"
 
@@ -15,9 +16,9 @@
 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 @@
 
 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 @@
 .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}
Prev by Date: [src/trunk]: src/distrib/utils/embedded/conf 4th time's a charm (I hope). Mak...
Next by Date: [src/trunk]: src/sys/arch/evbcf/include Use MBR compatible partitioning
Previous by Thread: [src/trunk]: src/distrib/utils/embedded/conf 4th time's a charm (I hope). Mak...
Next by Thread: [src/trunk]: src/sys/arch/evbcf/include Use MBR compatible partitioning
Indexes:
Home | Main Index | Thread Index | Old Index