Fri Jun 10 16:31:18 2011 UTC ()
If building the cross gcc for softfloat, add --with-float=soft so it will
default to it.


(matt)
diff -r1.35 -r1.36 src/tools/gcc/Makefile
cvs diff -r1.35 -r1.36 src/tools/gcc/Makefile (expand / switch to unified diff)

--- src/tools/gcc/Makefile 2011/03/24 13:33:42 1.35
+++ src/tools/gcc/Makefile 2011/06/10 16:31:18 1.36
@@ -1,46 +1,51 @@ @@ -1,46 +1,51 @@
1# $NetBSD: Makefile,v 1.35 2011/03/24 13:33:42 joerg Exp $ 1# $NetBSD: Makefile,v 1.36 2011/06/10 16:31:18 matt 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
7MKNATIVE_TARGET= gcc4 7MKNATIVE_TARGET= gcc4
8MKNATIVE_CONFIG_TARGET_LIBS= 8MKNATIVE_CONFIG_TARGET_LIBS=
9BINENV= /usr/bin/env -i 9BINENV= /usr/bin/env -i
10 10
11VAX_CONFIGURE_ARGS= 11VAX_CONFIGURE_ARGS=
12 12
13.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" 13.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64"
14MULTILIB_ARGS= --enable-multilib 14MULTILIB_ARGS= --enable-multilib
15.else 15.else
16MULTILIB_ARGS= --disable-multilib 16MULTILIB_ARGS= --disable-multilib
17.endif 17.endif
18 18
 19.if ${MKSOFTFLOAT} != "no"
 20SOFTFLOAT_ARGS= -with-float=soft
 21.endif
 22
19COMMON_CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} \ 23COMMON_CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} \
20 --enable-long-long \ 24 --enable-long-long \
21 --enable-threads \ 25 --enable-threads \
22 ${VAX_CONFIGURE_ARGS} \ 26 ${VAX_CONFIGURE_ARGS} \
23 --enable-__cxa_atexit 27 --enable-__cxa_atexit
24.if defined(GCC_CONFIG_ARCH.${MACHINE_ARCH}) 28.if defined(GCC_CONFIG_ARCH.${MACHINE_ARCH})
25COMMON_CONFIGURE_ARGS+= --with-arch=${GCC_CONFIG_ARCH.${MACHINE_ARCH}} 29COMMON_CONFIGURE_ARGS+= --with-arch=${GCC_CONFIG_ARCH.${MACHINE_ARCH}}
26.endif 30.endif
27.if defined(GCC_CONFIG_TUNE.${MACHINE_ARCH}) 31.if defined(GCC_CONFIG_TUNE.${MACHINE_ARCH})
28COMMON_CONFIGURE_ARGS+= --with-tune=${GCC_CONFIG_TUNE.${MACHINE_ARCH}} 32COMMON_CONFIGURE_ARGS+= --with-tune=${GCC_CONFIG_TUNE.${MACHINE_ARCH}}
29.endif 33.endif
30 34
31CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS} \ 35CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS} \
32 --disable-nls \ 36 --disable-nls \
33 ${MULTILIB_ARGS} \ 37 ${MULTILIB_ARGS} \
 38 ${SOFTFLOAT_ARGS} \
34 --program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-," \ 39 --program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-," \
35 --enable-languages="${GCC_LANGUAGES}" 40 --enable-languages="${GCC_LANGUAGES}"
36 41
37GCC_CPPFLAGS= -DNETBSD_TOOLS -DTARGET_SYSTEM_ROOT=0 \ 42GCC_CPPFLAGS= -DNETBSD_TOOLS -DTARGET_SYSTEM_ROOT=0 \
38 -DTARGET_SYSTEM_ROOT_RELOCATABLE 43 -DTARGET_SYSTEM_ROOT_RELOCATABLE
39 44
40MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q} \ 45MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q} \
41 LIBGCC= LIBGCC1= LIBGCC1_TEST= LIBGCC2= INSTALL_LIBGCC= \ 46 LIBGCC= LIBGCC1= LIBGCC1_TEST= LIBGCC2= INSTALL_LIBGCC= \
42 EXTRA_PARTS= CPPFLAGS=${GCC_CPPFLAGS:Q} \ 47 EXTRA_PARTS= CPPFLAGS=${GCC_CPPFLAGS:Q} \
43 AR=${HOST_AR:Q} RANLIB=${HOST_RANLIB:Q} 48 AR=${HOST_AR:Q} RANLIB=${HOST_RANLIB:Q}
44 49
45CONFIGURE_ENV+= gcc_cv_libc_provides_ssp=yes 50CONFIGURE_ENV+= gcc_cv_libc_provides_ssp=yes
46 51