Tue Jan 10 12:27:54 2012 UTC ()
Fix bootstrap-libgcc for gcc 4.5


(skrll)
diff -r1.49 -r1.50 src/tools/gcc/Makefile
diff -r1.65 -r1.66 src/tools/gcc/mknative-gcc
cvs diff -r1.49 -r1.50 src/tools/gcc/Makefile (expand / switch to unified diff)

--- src/tools/gcc/Makefile 2012/01/10 12:26:45 1.49
+++ src/tools/gcc/Makefile 2012/01/10 12:27:54 1.50
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.49 2012/01/10 12:26:45 skrll Exp $ 1# $NetBSD: Makefile,v 1.50 2012/01/10 12:27:54 skrll Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5GCC_LANGUAGES=c c++ objc 5GCC_LANGUAGES=c c++ objc
6MODULE= gcc4 6MODULE= gcc4
7 7
8MKNATIVE_CONFIG_TARGET_LIBS= \ 8MKNATIVE_CONFIG_TARGET_LIBS= \
9 configure-target-libiberty \ 9 configure-target-libiberty \
10 configure-target-libstdc++-v3 \ 10 configure-target-libstdc++-v3 \
11 configure-target-libobjc 11 configure-target-libobjc
12 12
13.if ${HAVE_GCC} == 45 13.if ${HAVE_GCC} == 45
14MKNATIVE_TARGET= gcc45 14MKNATIVE_TARGET= gcc45
@@ -107,27 +107,27 @@ BUILD_MAKE=${TOOL_GMAKE} @@ -107,27 +107,27 @@ BUILD_MAKE=${TOOL_GMAKE}
107GCCSRCDIR=${.CURDIR}/../../gnu/dist/gcc4 107GCCSRCDIR=${.CURDIR}/../../gnu/dist/gcc4
108.else 108.else
109GCCSRCDIR=${.CURDIR}/../../external/gpl3/gcc/dist 109GCCSRCDIR=${.CURDIR}/../../external/gpl3/gcc/dist
110.endif 110.endif
111 111
112CXXADDFLAGS= --sysroot=${DESTDIR} 112CXXADDFLAGS= --sysroot=${DESTDIR}
113CCADDFLAGS= --sysroot=${DESTDIR} -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/gcc/include 113CCADDFLAGS= --sysroot=${DESTDIR} -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/gcc/include
114 114
115NEWCONFIGDIR?= ${.CURDIR}/../.. 115NEWCONFIGDIR?= ${.CURDIR}/../..
116MKNATIVE?= ${.CURDIR}/mknative-gcc 116MKNATIVE?= ${.CURDIR}/mknative-gcc
117 117
118bootstrap-libgcc: .configure_done 118bootstrap-libgcc: .configure_done
119 @echo 'Creating files needed for libgcc by a native bootstrap build.' 119 @echo 'Creating files needed for libgcc by a native bootstrap build.'
120 @MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} lib${MODULE} \ 120 @MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} lib${MKNATIVE_TARGET} \
121 ${.OBJDIR}/build ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM} \ 121 ${.OBJDIR}/build ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM} \
122 ${DESTDIR} 122 ${DESTDIR}
123 123
124native-gcc: .native/.configure_done 124native-gcc: .native/.configure_done
125 @echo 'Extracting GNU GCC configury for a native toolchain.' 125 @echo 'Extracting GNU GCC configury for a native toolchain.'
126 @MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} ${MKNATIVE_TARGET} \ 126 @MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} ${MKNATIVE_TARGET} \
127 ${.OBJDIR}/.native ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM} \ 127 ${.OBJDIR}/.native ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM} \
128 ${DESTDIR} 128 ${DESTDIR}
129 129
130NATIVE_CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS} 130NATIVE_CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
131.if ${HAVE_GCC} >= 45 131.if ${HAVE_GCC} >= 45
132NATIVE_CONFIGURE_ARGS+= \ 132NATIVE_CONFIGURE_ARGS+= \
133 --with-mpc=${DESTDIR}/usr \ 133 --with-mpc=${DESTDIR}/usr \
cvs diff -r1.65 -r1.66 src/tools/gcc/mknative-gcc (expand / switch to unified diff)

--- src/tools/gcc/mknative-gcc 2011/10/13 19:52:33 1.65
+++ src/tools/gcc/mknative-gcc 2012/01/10 12:27:54 1.66
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1#!/bin/sh 1#!/bin/sh
2# $NetBSD: mknative-gcc,v 1.65 2011/10/13 19:52:33 matt Exp $ 2# $NetBSD: mknative-gcc,v 1.66 2012/01/10 12:27:54 skrll Exp $
3# 3#
4# Shell script for generating all the constants needed for a native 4# Shell script for generating all the constants needed for a native
5# platform build of src/gnu/dist/gcc. 5# platform build of src/gnu/dist/gcc.
6# 6#
7 7
8# initialise 8# initialise
9 9
10_TMPDIR=$2 10_TMPDIR=$2
11_TOP=$3 11_TOP=$3
12_PLATFORM=$4 12_PLATFORM=$4
13_DESTDIR=$5 13_DESTDIR=$5
14_ABI=$6 14_ABI=$6
15_VPATH=`grep VPATH ${_TMPDIR}/Makefile | sed 's,^.*=[ ]*,,'` 15_VPATH=`grep VPATH ${_TMPDIR}/Makefile | sed 's,^.*=[ ]*,,'`
@@ -681,26 +681,35 @@ case "$1" in @@ -681,26 +681,35 @@ case "$1" in
681# .mk and .h files for libgcc bootstrap (from host build) 681# .mk and .h files for libgcc bootstrap (from host build)
682libgcc) 682libgcc)
683 get_libgcc gcc3 683 get_libgcc gcc3
684 get_crtstuff crtstuff3 684 get_crtstuff crtstuff3
685 exit 0 685 exit 0
686 ;; 686 ;;
687 687
688libgcc4) 688libgcc4)
689 get_libgcc gcc4 689 get_libgcc gcc4
690 get_crtstuff crtstuff4 690 get_crtstuff crtstuff4
691 exit 0 691 exit 0
692 ;; 692 ;;
693 693
 694libgcc45)
 695 _OUTDIR="$_TOP/external/gpl3/gcc"
 696 _OUTDIRBASE="external/gpl3/gcc"
 697 get_libgcc gcc
 698 get_crtstuff crtstuff
 699 get_libgcov gcc
 700 exit 0
 701 ;;
 702
694# gcc files 703# gcc files
695gcc4) 704gcc4)
696 get_gcc gcc4 705 get_gcc gcc4
697 get_libgcc gcc4 706 get_libgcc gcc4
698 get_libgcov gcc4 707 get_libgcov gcc4
699 get_crtstuff crtstuff4 708 get_crtstuff crtstuff4
700 get_gcc_libiberty gcc4 709 get_gcc_libiberty gcc4
701 get_libobjc libobjc4 710 get_libobjc libobjc4
702 get_libstdcxx_v3 libstdc++-v3_4 711 get_libstdcxx_v3 libstdc++-v3_4
703 exit 0 712 exit 0
704 ;; 713 ;;
705 714
706gcc45) 715gcc45)