Module Name: src Committed By: matt Date: Thu Dec 19 01:16:13 UTC 2013
Modified Files: src/gnu/lib/libgcc4/libgcov [matt-nb5-mips64]: Makefile src/gnu/lib/libiberty [matt-nb5-mips64]: Makefile src/gnu/lib/libsupc++4 [matt-nb5-mips64]: Makefile.common Log Message: support for armv7/armv7eb MACHINE_ARCH To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.8.1 src/gnu/lib/libgcc4/libgcov/Makefile cvs rdiff -u -r1.10.30.1 -r1.10.30.2 src/gnu/lib/libiberty/Makefile cvs rdiff -u -r1.1 -r1.1.32.1 src/gnu/lib/libsupc++4/Makefile.common 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/libgcc4/libgcov/Makefile diff -u src/gnu/lib/libgcc4/libgcov/Makefile:1.3 src/gnu/lib/libgcc4/libgcov/Makefile:1.3.8.1 --- src/gnu/lib/libgcc4/libgcov/Makefile:1.3 Mon Oct 6 14:20:12 2008 +++ src/gnu/lib/libgcc4/libgcov/Makefile Thu Dec 19 01:16:13 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/10/06 14:20:12 tron Exp $ +# $NetBSD: Makefile,v 1.3.8.1 2013/12/19 01:16:13 matt Exp $ REQUIRETOOLS= yes NOPIC= # defined @@ -8,17 +8,18 @@ NOLINT= # defined LIB= gcov .include <bsd.own.mk> +.include "../../Makefile.inc" -.if exists(${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk) && ${MKGCC} != "no" +.if exists(${.CURDIR}/arch/${GCC_MACHINE_ARCH}/defs.mk) && ${MKGCC} != "no" -.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk" +.include "${.CURDIR}/arch/${GCC_MACHINE_ARCH}/defs.mk" LIBGCOVSRCS= ${G_LIBGCOV:=.c} -CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH} +CPPFLAGS+= -I${.CURDIR}/arch/${GCC_MACHINE_ARCH} CPPFLAGS+= -Wno-stack-protector -DPSRCS+= ${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk +DPSRCS+= ${.CURDIR}/arch/${GCC_MACHINE_ARCH}/defs.mk SRCS+= ${LIBGCOVSRCS} CLEANFILES+= ${LIBGCOVSRCS} Index: src/gnu/lib/libiberty/Makefile diff -u src/gnu/lib/libiberty/Makefile:1.10.30.1 src/gnu/lib/libiberty/Makefile:1.10.30.2 --- src/gnu/lib/libiberty/Makefile:1.10.30.1 Wed Dec 18 18:41:39 2013 +++ src/gnu/lib/libiberty/Makefile Thu Dec 19 01:16:13 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10.30.1 2013/12/18 18:41:39 matt Exp $ +# $NetBSD: Makefile,v 1.10.30.2 2013/12/19 01:16:13 matt Exp $ NOLINT= # defined NOPROFILE= # defined @@ -6,10 +6,11 @@ NOPIC= # defined NOLINKLIB= # defined .include <bsd.own.mk> +.include "../Makefile.inc" LIB= iberty -.include "${.CURDIR}/arch/${MACHINE_ARCH:S/armv7/arm/}/defs.mk" +.include "${.CURDIR}/arch/${GCC_MACHINE_ARCH}/defs.mk" COPTS.argv.c = -Wno-stack-protector COPTS.cp-demangle.c = -Wno-stack-protector @@ -21,7 +22,7 @@ DIST= ${NETBSDSRCDIR}/gnu/dist/binutils 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 .PATH: ${DIST}/libiberty Index: src/gnu/lib/libsupc++4/Makefile.common diff -u src/gnu/lib/libsupc++4/Makefile.common:1.1 src/gnu/lib/libsupc++4/Makefile.common:1.1.32.1 --- src/gnu/lib/libsupc++4/Makefile.common:1.1 Wed May 10 22:53:51 2006 +++ src/gnu/lib/libsupc++4/Makefile.common Thu Dec 19 01:16:13 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2006/05/10 22:53:51 mrg Exp $ +# $NetBSD: Makefile.common,v 1.1.32.1 2013/12/19 01:16:13 matt Exp $ DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4 GNUHOSTDIST= ${DIST} @@ -10,7 +10,7 @@ LIBSUPCXXSRCS= ${G_LIBSUPCXX_SOURCES} ${ CPPFLAGS+= -I${DIST}/gcc CPPFLAGS+= -I${DIST}/include CPPFLAGS+= -I${DIST}/libstdc++-v3/libsupc++ -CPPFLAGS+= -I${.CURDIR}/../libstdc++-v3_4/arch/${MACHINE_ARCH} -I. +CPPFLAGS+= -I${.CURDIR}/../libstdc++-v3_4/arch/${GCC_MACHINE_ARCH} -I. CPPFLAGS+= -DHAVE_STDLIB_H -DHAVE_STRING_H CPPFLAGS.cp-demangle.c=-DIN_GLIBCPP_V3