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

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/external/gpl3/gcc/usr.bin Add MACHINE_ARCH's evbearmv5-e[bl]...
From: matt <matt%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 01:12:29 +0000
details:   https://anonhg.NetBSD.org/src/rev/14eaead296ca
branches:  trunk
changeset: 789557:14eaead296ca
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Aug 22 00:17:48 2013 +0000

description:
Add MACHINE_ARCH's evbearmv5-e[bl] to work

diffstat:

 external/gpl3/gcc/usr.bin/Makefile              |   6 ++++--
 external/gpl3/gcc/usr.bin/Makefile.inc          |   5 +++--
 external/gpl3/gcc/usr.bin/backend/Makefile      |  14 +++++++-------
 external/gpl3/gcc/usr.bin/cpp/Makefile          |   6 +++---
 external/gpl3/gcc/usr.bin/frontend/Makefile     |   6 +++---
 external/gpl3/gcc/usr.bin/include/Makefile      |   8 ++++----
 external/gpl3/gcc/usr.bin/libcpp/Makefile       |   4 ++--
 external/gpl3/gcc/usr.bin/libdecnumber/Makefile |   2 +-
 8 files changed, 27 insertions(+), 24 deletions(-)

diffs (190 lines):

diff -r 141a6c31e4e3 -r 14eaead296ca external/gpl3/gcc/usr.bin/Makefile
--- a/external/gpl3/gcc/usr.bin/Makefile        Thu Aug 22 00:16:54 2013 +0000
+++ b/external/gpl3/gcc/usr.bin/Makefile        Thu Aug 22 00:17:48 2013 +0000
@@ -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.
 
diff -r 141a6c31e4e3 -r 14eaead296ca external/gpl3/gcc/usr.bin/Makefile.inc
--- a/external/gpl3/gcc/usr.bin/Makefile.inc    Thu Aug 22 00:16:54 2013 +0000
+++ b/external/gpl3/gcc/usr.bin/Makefile.inc    Thu Aug 22 00:17:48 2013 +0000
@@ -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}/..
diff -r 141a6c31e4e3 -r 14eaead296ca external/gpl3/gcc/usr.bin/backend/Makefile
--- a/external/gpl3/gcc/usr.bin/backend/Makefile        Thu Aug 22 00:16:54 2013 +0000
+++ b/external/gpl3/gcc/usr.bin/backend/Makefile        Thu Aug 22 00:17:48 2013 +0000
@@ -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.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 @@
 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 @@
 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
diff -r 141a6c31e4e3 -r 14eaead296ca external/gpl3/gcc/usr.bin/cpp/Makefile
--- a/external/gpl3/gcc/usr.bin/cpp/Makefile    Thu Aug 22 00:16:54 2013 +0000
+++ b/external/gpl3/gcc/usr.bin/cpp/Makefile    Thu Aug 22 00:17:48 2013 +0000
@@ -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 @@
 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
diff -r 141a6c31e4e3 -r 14eaead296ca external/gpl3/gcc/usr.bin/frontend/Makefile
--- a/external/gpl3/gcc/usr.bin/frontend/Makefile       Thu Aug 22 00:16:54 2013 +0000
+++ b/external/gpl3/gcc/usr.bin/frontend/Makefile       Thu Aug 22 00:17:48 2013 +0000
@@ -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 @@
 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
diff -r 141a6c31e4e3 -r 14eaead296ca external/gpl3/gcc/usr.bin/include/Makefile
--- a/external/gpl3/gcc/usr.bin/include/Makefile        Thu Aug 22 00:16:54 2013 +0000
+++ b/external/gpl3/gcc/usr.bin/include/Makefile        Thu Aug 22 00:17:48 2013 +0000
@@ -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
diff -r 141a6c31e4e3 -r 14eaead296ca external/gpl3/gcc/usr.bin/libcpp/Makefile
--- a/external/gpl3/gcc/usr.bin/libcpp/Makefile Thu Aug 22 00:16:54 2013 +0000
+++ b/external/gpl3/gcc/usr.bin/libcpp/Makefile Thu Aug 22 00:17:48 2013 +0000
@@ -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 @@
 
 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\"
diff -r 141a6c31e4e3 -r 14eaead296ca external/gpl3/gcc/usr.bin/libdecnumber/Makefile
--- a/external/gpl3/gcc/usr.bin/libdecnumber/Makefile   Thu Aug 22 00:16:54 2013 +0000
+++ b/external/gpl3/gcc/usr.bin/libdecnumber/Makefile   Thu Aug 22 00:17:48 2013 +0000
@@ -10,7 +10,7 @@
 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>
Prev by Date: [src/trunk]: src/sys/arch/evbcf/include Use MBR compatible partitioning
Next by Date: [src/trunk]: src/etc/mtree Re-add "/usr/include/gcc-4.1". It is only obsolete...
Previous by Thread: [src/trunk]: src/sys/arch/evbcf/include Use MBR compatible partitioning
Next by Thread: [src/trunk]: src/etc/mtree Re-add "/usr/include/gcc-4.1". It is only obsolete...
Indexes:
Home | Main Index | Thread Index | Old Index