Module Name: src
Committed By: mrg
Date: Sun Mar 2 04:31:55 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile
Removed Files:
src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/armeb: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3eb: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax: gthr-default.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64: gthr-default.h
Log Message:
- set DIST based upon EXTERNAL_GCC_SUBDIR
- set GNUHOSTDIST
- move gthr-default.h to BUILDINCS, and add glue to add it to COPYHEADERS
- adjust COPYHEADERS to cope with files outside of dist/libstdc++-v3/.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/armeb/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/gthr-default.h
cvs rdiff -u -r1.1 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/gthr-default.h
cvs rdiff -u -r1.1 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3eb/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax/gthr-default.h
cvs rdiff -u -r1.2 -r0 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/gthr-default.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/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/libstdc++-v3/include/bits/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.12 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.13
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.12 Sun Mar 2 03:47:57 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile Sun Mar 2 04:31:55 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/03/02 03:47:57 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2014/03/02 04:31:55 mrg Exp $
.include <bsd.own.mk>
.include <bsd.init.mk>
@@ -7,13 +7,14 @@
.cc: # disable .cc->NULL transform
-DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
+DIST= ${NETBSDSRCDIR}/external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist
+GNUHOSTDIST= ${DIST}
BUILDINCS= basic_file.h c++allocator.h c++io.h c++locale.h
-BUILDINCS+= messages_members.h time_members.h opt_random.h
+BUILDINCS+= messages_members.h time_members.h opt_random.h gthr-default.h
INCS= ${G_bits_headers} ${G_c_base_headers_extra} ${G_host_headers}
-INCS+= gthr.h gthr-single.h gthr-posix.h gthr-default.h
+INCS+= gthr.h gthr-single.h gthr-posix.h
INCS+= ${BUILDINCS}
# libsupc++
@@ -34,16 +35,23 @@ CLEANFILES+= {BUILDINCS}
CXXDIST= ${DIST}/libstdc++-v3
COPYHEADERS= \
- opt_random.h ${G_CPU_OPT_BITS_RANDOM} \
- basic_file.h ${G_BASIC_FILE_H} \
- c++allocator.h ${G_ALLOCATOR_H} \
- c++locale.h ${G_CLOCALE_H} \
- c++io.h ${G_CSTDIO_H} \
- messages_members.h ${G_CMESSAGES_H} \
- time_members.h ${G_CTIME_H}
+ opt_random.h ${CXXDIST}/${G_CPU_OPT_BITS_RANDOM} \
+ basic_file.h ${CXXDIST}/${G_BASIC_FILE_H} \
+ c++allocator.h ${CXXDIST}/${G_ALLOCATOR_H} \
+ c++locale.h ${CXXDIST}/${G_CLOCALE_H} \
+ c++io.h ${CXXDIST}/${G_CSTDIO_H} \
+ messages_members.h ${CXXDIST}/${G_CMESSAGES_H} \
+ time_members.h ${CXXDIST}/${G_CTIME_H}
+
+# gthr-default.h is a little special
+.for _src _dst in ${G_CONFIGLINKS}
+. if ${_dst} == "gthr-default.h"
+COPYHEADERS+= ${_dst} ${_src}
+. endif
+.endfor
.for _h _s in ${COPYHEADERS}
-${_h}: ${CXXDIST}/${_s}
+${_h}: ${_s}
cp -p ${.ALLSRC} ${.TARGET}
.endfor
