Module Name: src
Committed By: mrg
Date: Wed Jun 29 02:02:38 UTC 2011
Modified Files:
src/tools/gcc: Makefile mknative-gcc
Log Message:
get libdecnumber info out of GCC.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/tools/gcc/Makefile
cvs rdiff -u -r1.50 -r1.51 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.39 src/tools/gcc/Makefile:1.40
--- src/tools/gcc/Makefile:1.39 Thu Jun 23 05:42:37 2011
+++ src/tools/gcc/Makefile Wed Jun 29 02:02:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2011/06/23 05:42:37 mrg Exp $
+# $NetBSD: Makefile,v 1.40 2011/06/29 02:02:38 mrg Exp $
.include <bsd.own.mk>
@@ -142,7 +142,8 @@
(cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE} all-build-libiberty)
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE} configure-gcc configure-libcpp) && \
- (cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE} configure-libiberty)
+ (cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE} configure-libiberty) && \
+ (cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE} configure-libdecnumber)
# edit Makefile so that maybe-all-gcc does not depend on all-gcc any more.
(cd .native && mv Makefile Makefile.config && \
${TOOL_SED} -e 's/\(maybe-all-gcc:\) all-gcc/\1/' \
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.50 src/tools/gcc/mknative-gcc:1.51
--- src/tools/gcc/mknative-gcc:1.50 Tue Jun 28 04:30:32 2011
+++ src/tools/gcc/mknative-gcc Wed Jun 29 02:02:38 2011
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.50 2011/06/28 04:30:32 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.51 2011/06/29 02:02:38 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of src/gnu/dist/gcc.
@@ -434,6 +434,16 @@
<$_TMPDIR/libiberty/config.h
}
+##### lib/libdecnumber #####
+
+get_libdecnumber () {
+ _subdir="$1"
+
+ mkdir -p $_OUTDIR/lib/$_subdir/arch/$MACHINE_ARCH
+ write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/config.h \
+ <$_TMPDIR/libdecnumber/config.h
+}
+
##### gnu/lib/libobjc #####
get_libobjc () {
@@ -567,7 +577,7 @@
getvars gcc/Makefile \
F77_OBJS | sed 's/f\///g'
case ${_subdir} in
- gcc4)
+ gcc4 | gcc)
getvars libcpp/Makefile \
libcpp_a_OBJS
;;
@@ -592,16 +602,18 @@
hfiles='auto-host gencheck configargs gthr-default tm bconfig config multilib'
;;
gcc)
- write_c $_OUTDIRBASE/usr.bin/$_subdir/libcpp/arch/$MACHINE_ARCH/config.h <$_TMPDIR/libcpp/config.h
- hfiles='auto-host configargs gthr-default tm bconfig config multilib'
+ mkdir -p $_OUTDIR/usr.bin/libcpp/arch/$MACHINE_ARCH
+ write_c $_OUTDIRBASE/usr.bin/libcpp/arch/$MACHINE_ARCH/config.h <$_TMPDIR/libcpp/config.h
+ hfiles='auto-host configargs gthr-default tm bconfig config multilib bversion plugin-version'
;;
esac
for f in $hfiles; do
write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h <$_TMPDIR/gcc/$f.h
done
- write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/bversion.h \
- <$_TMPDIR/gcc/bversion.h
+ for f in all-tree.def; do
+ write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f <$_TMPDIR/gcc/$f
+ done
}
##### main #####
@@ -642,6 +654,7 @@
get_gcc_libiberty gcc
get_libobjc libobjc
get_libstdcxx_v3 libstdc++-v3
+ get_libdecnumber libdecnumber
exit 0
;;
