 @@ -1,340 +1,348 @@
 #!/bin/sh
-#	$NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp $
+#	$NetBSD: mknative-gcc,v 1.26 2009/11/30 05:50:07 uebayasi Exp $
+#
 # Shell script for generating all the constants needed for a native
 # platform build of src/gnu/dist/gcc.
+#
 # initialise
 _TMPDIR=$2
 _TOP=$3
 _PLATFORM=$4
 _VPATH=`grep VPATH ${_TMPDIR}/Makefile | sed 's,^.*=[ 	]*,,'`
 _GNU_DIST=`cd ${_VPATH}; pwd`
 . $_TOP/tools/gcc/mknative.common
 ##### gnu/lib/crtstuff #####
 get_crtstuff () {
 	_subdir="$1"
 	mkdir -p $_TOP/gnu/lib/$_subdir/arch
 	getvars gcc/Makefile \
 		INCLUDES CRTSTUFF_CFLAGS CRTSTUFF_T_CFLAGS \
 		tm_defines xm_file xm_defines \
 		| write_mk gnu/lib/$_subdir/arch/$MACHINE_ARCH.mk
+}
 ##### gnu/lib/libg2c #####
 get_libg2c () {
 	mkdir -p $_TOP/gnu/lib/libg2c3/arch/$MACHINE_ARCH
 	write_c gnu/lib/libg2c3/arch/$MACHINE_ARCH/config.h <$_TMPDIR/$_PLATFORM/libf2c/libU77/config.h
 	write_c gnu/lib/libg2c3/arch/$MACHINE_ARCH/g2c.h <$_TMPDIR/$_PLATFORM/libf2c/g2c.h
+	{
 		getvars $_PLATFORM/libf2c/Makefile \
 			F2CEXT
 		getvars $_PLATFORM/libf2c/libF77/Makefile \
 			ALL_CFLAGS OBJS
 		getvars $_PLATFORM/libf2c/libI77/Makefile \
 			ALL_CFLAGS OBJS | sed 's,=,+=,'
 		getvars $_PLATFORM/libf2c/libU77/Makefile \
 			ALL_CFLAGS OBJS | sed 's,=,+=,'
 	} | write_mk gnu/lib/libg2c3/arch/$MACHINE_ARCH/defs.mk
+}
 ##### gnu/lib/libgcc #####
 get_libgcc_new () {
+}
 get_libgcc () {
 	_subdir="$1"
 	mkdir -p $_TOP/gnu/lib/lib$_subdir/arch
 	case "$_subdir" in
 	gcc3)
 		_extravars="USE_COLLECT2 LIB2FUNCS_1 LIB2FUNCS_2 xm_file"
 		_archsubdir=""
 		;;
 	gcc4)
 		_extravars="COLLECT2 UNWIND_H xm_include_list"
 		_archsubdir=""
 		;;
 	esac
 	# DPBIT, FPBIT only used on mn10[23]00, we don't need them.
 	# XXX we should probably grab everything Just In Case for
 	# the future.
+	{
 		getvars gcc/Makefile \
 			INCLUDES LIB2ADD LIB2ADDEH \
 			LIB1ASMFUNCS LIB1ASMSRC \
 			LIB2_DIVMOD_FUNCS LIB2FUNCS_ST \
 			LIBGCC2_CFLAGS \
 			SHLIB_MKMAP SHLIB_MKMAP_OPTS \
 			SHLIB_MAPFILES SHLIB_NM_FLAGS \
 			EXTRA_HEADERS xm_defines \
 			tm_defines ${_extravars}
 	} | write_mk gnu/lib/lib$_subdir/arch${_archsubdir}/$MACHINE_ARCH.mk
 	# Generate new style files.
 	if [ -n "${MKNATIVE_LIBGCC_NEW} ]
 		get_libgcc_new
 	fi
+}
 ##### gnu/lib/libgcov #####
 get_libgcov () {
 	_subdir="$1"
 	mkdir -p $_TOP/gnu/lib/lib$_subdir/libgcov/arch/$MACHINE_ARCH
+	{
 		getvars gcc/Makefile \
 			LIBGCOV
 	} | write_mk gnu/lib/lib$_subdir/libgcov/arch/$MACHINE_ARCH/defs.mk
 	write_c gnu/lib/lib$_subdir/libgcov/arch/$MACHINE_ARCH/gcov-iov.h \
 	   <$_TMPDIR/gcc/gcov-iov.h
+}
 ##### gnu/usr.bin/gcc[34]/libiberty #####
 get_gcc_libiberty () {
 	_subdir="$1"
 	mkdir -p $_TOP/gnu/usr.bin/$_subdir/libiberty/arch/$MACHINE_ARCH
 	getvars libiberty/Makefile \
 		ALLOCA EXTRA_OFILES LIBOBJS REQUIRED_OFILES \
 		| write_mk gnu/usr.bin/$_subdir/libiberty/defs.mk
 	write_c gnu/usr.bin/$_subdir/libiberty/arch/$MACHINE_ARCH/config.h \
 		<$_TMPDIR/libiberty/config.h
+}
 ##### gnu/lib/libobjc #####
 get_libobjc () {
 	case "$1" in
 	*4)
 		_subdir="$1/arch/$MACHINE_ARCH"
 		_options="ALL_OPT_FILES"
 		_unwind="UNWIND_H"
 		;;
 	*)
 		_subdir="$1"
 		_options=""
 		_unwind=""
 		;;
 	esac
 	mkdir -p $_TOP/gnu/lib/$_subdir
+	{
 		if [ -n "$_options" ]; then
 			getvars gcc/Makefile $_options
 		fi
 		getvars $_PLATFORM/libobjc/Makefile \
 			ALL_CFLAGS INCLUDES OBJS OBJC_H \
 			| sed "s,$_GNU_DIST,\${GNUHOSTDIST},g"
 		if [ -n "$_unwind" ]; then
 			getvars gcc/Makefile $_unwind
 		fi
 	} | write_mk gnu/lib/$_subdir/defs.mk
 	write_c gnu/lib/$_subdir/config.h \
 		<$_TMPDIR/$_PLATFORM/libobjc/config.h
+}
 ##### gnu/lib/libstdc++-v3 #####
 get_libstdcxx_v3 () {
 	_subdir="$1"
 	mkdir -p $_TOP/gnu/lib/$_subdir/arch/$MACHINE_ARCH
 	case ${_subdir} in
 	*4)
 		_src_CC_files="atomicity_file CCODECVT_CC CCOLLATE_CC CCTYPE_CC CMESSAGES_CC CMONEY_CC CNUMERIC_CC CTIME_CC CLOCALE_CC BASIC_FILE_CC"
 		_headers1="host_headers debug_headers tr1_headers c_compatibility_headers_extra"
 		_headers2="thread_host_headers host_headers_extra"
 		_build_headers="c++allocator.h c++config.h cxxabi_tweaks.h gthr-default.h gthr-posix.h gthr-single.h gthr-tpf.h gthr.h"
 		_unwind="UNWIND_H"
 		;;
 	*)
 		_src_CC_files=""
 		_headers1="target_headers"
 		_headers2="thread_target_headers target_headers_extra"
 		_build_headers="c++config.h gthr-default.h gthr-posix.h gthr-single.h gthr.h"
 		_unwind=""
 		;;
 	esac
 	# build files
 	for h in $_build_headers; do
 		write_c gnu/lib/$_subdir/arch/$MACHINE_ARCH/$h \
 			<$_TMPDIR/$_PLATFORM/libstdc++-v3/include/$_PLATFORM/bits/$h
 	done
 	write_c gnu/lib/$_subdir/arch/$MACHINE_ARCH/config.h \
 		<$_TMPDIR/$_PLATFORM/libstdc++-v3/config.h
+	{
 		# libmath
 		getvars $_PLATFORM/libstdc++-v3/libmath/Makefile \
 			libmath_la_SOURCES libmath_la_LIBADD
 		# libsupc++
 		getvars $_PLATFORM/libstdc++-v3/libsupc++/Makefile \
 			sources | sed 's/^G_sources=/G_LIBSUPCXX_SOURCES=/'
 		getvars $_PLATFORM/libstdc++-v3/libsupc++/Makefile \
 			c_sources | sed 's/^G_c_sources=/G_LIBSUPCXX_C_SOURCES=/'
 		# src
 		getvars $_PLATFORM/libstdc++-v3/src/Makefile \
 			sources $_src_CC_files SECTION_FLAGS | sed 's/^G_sources=/G_SRC_SOURCES=/'
 		# include
 		getvars $_PLATFORM/libstdc++-v3/include/Makefile \
 			c_base_headers_rename std_headers_rename
 		getvars $_PLATFORM/libstdc++-v3/include/Makefile \
 			bits_headers backward_headers ext_headers c_base_headers_extra \
 			$_headers1 | sed -e 's#/[^ 	][^ 	]*/##g' -e 's/\${GNUHOSTDIST}//g'
 		getvars $_PLATFORM/libstdc++-v3/include/Makefile \
 			$_headers2 | sed -e 's#\./[^ 	][^ 	]*/##g' -e 's/\${GNUHOSTDIST}//g'
 		if [ -n "$_unwind" ]; then
 			getvars gcc/Makefile $_unwind
 		fi
 	} | write_mk gnu/lib/$_subdir/arch/$MACHINE_ARCH/defs.mk
+}
 ##### gnu/usr.bin/gcc3 #####
 get_gcc () {
 	_subdir="$1"
 	mkdir -p $_TOP/gnu/usr.bin/$_subdir/arch/$MACHINE_ARCH
 	case ${_subdir} in
 	gcc4)
 		mkdir -p $_TOP/gnu/usr.bin/$_subdir/libcpp/arch/$MACHINE_ARCH
 		_buildname="BUILD_"
 		_libcppsubdir=""
 		_extravars="TM_H ALL_OPT_FILES"
 		_hconfig_h=""
 		_extravars2="tm_file_list build_xm_include_list"
 		_extravars3="tm_p_include_list"
 		;;
 	*)
 		_buildname="HOST_"
 		_libcppsubdir="gcc/"
 		_extravars=""
 		_hconfig_h="HCONFIG_H"
 		_extravars2=""
 		_extravars3=""
 		;;
 	esac
+	{
 		getvars gcc/Makefile \
 			${_buildname}EARLY_SUPPORT ${_buildname}ERRORS ${_buildname}PRINT \
 			${_buildname}RTL ${_buildname}SUPPORT ${_buildname}VARRAY | \
 		    sed -e 's#build/errors.o#build-errors.o#g' \
 			-e 's#build/print-rtl.o#build-print-rtl.o#g' \
 			-e 's#build/rtl.o#build-rtl.o#g' \
 			-e 's#build/varray.o#build-varray.o#g' \
 			-e 's#build/ggc-none.o#build-ggc-none.o#g' \
 			-e 's#build/##g'
 		getvars gcc/Makefile \
 			ALL_CFLAGS ALL_CPPFLAGS C_AND_OBJC_OBJS C_OBJS CCCP_OBJS \
 			GCOV_OBJS PROTO_OBJS ${_extravars1} \
 			INCLUDES md_file OBJC_OBJS OBJS out_file version \
 			BUILD_PREFIX RTL_H TREE_H ${_hconfig_h} BASIC_BLOCK_H GCC_H \
 			GTFILES_SRCDIR GTFILES_FILES_FILES GTFILES_FILES_LANGS \
 			GTFILES GTFILES_LANG_DIR_NAMES \
 			tm_defines host_xm_file host_xm_defines tm_p_file \
 			target_cpu_default ${_extravars} ${_extravars2} \
 			lang_specs_files ${_extravars3}
 		getvars gcc/Makefile \
 			LIB2ADDEHDEP | sed 's/unwind.inc//'
 		getvars gcc/Makefile \
 			CXX_OBJS CXX_C_OBJS | sed 's/cp\///g'
 		getvars gcc/Makefile \
 			F77_OBJS | sed 's/f\///g'
 		case ${_subdir} in
 		gcc4)
 			getvars libcpp/Makefile \
 				libcpp_a_OBJS
 			;;
 		gcc3)
 			getvars gcc/Makefile \
 				LIBCPP_OBJS LIBCPP_H
 			;;
 		esac
 		getvars gcc/Makefile \
 			ENABLE_SHARED
 		case ${_subdir} in
 		gcc4)
 			echo G_SHLIB_LINK="$CC -shared"
 			echo G_SHLIB_MULTILIB=.
 			;;
 		gcc3)
 			getvars gcc/Makefile \
 				SHLIB_LINK SHLIB_MULTILIB
 			;;
 		esac
 	} | write_mk gnu/usr.bin/$_subdir/arch/$MACHINE_ARCH/defs.mk
 	case "$_subdir" in
 	gcc3)
 		hfiles='auto-host configargs cs-hconfig gencheck hconfig gthr-default'
 		;;
 	gcc4)
 		write_c gnu/usr.bin/$_subdir/libcpp/arch/$MACHINE_ARCH/config.h <$_TMPDIR/libcpp/config.h
 		hfiles='auto-host configargs gencheck gthr-default tm bconfig config multilib'
 		;;
 	esac
 	for f in $hfiles; do
 		write_c gnu/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h <$_TMPDIR/gcc/$f.h
 	done
+}
 ##### main #####
 case "$1" in
 # .mk and .h files for libgcc bootstrap (from host build)
 libgcc)
 	get_libgcc gcc3
 	get_crtstuff crtstuff3
 	exit 0
 	;;
 libgcc4)
 	get_libgcc gcc4
 	get_crtstuff crtstuff4
 	exit 0
 	;;
 # gcc files
 gcc4)
 	get_gcc gcc4
 	get_libgcc gcc4
 	get_libgcov gcc4
 	get_crtstuff crtstuff4
 	get_gcc_libiberty gcc4
 	get_libobjc libobjc4
 	get_libstdcxx_v3 libstdc++-v3_4
 	exit 0
 	;;
 gcc3)
 	get_gcc gcc3
 	get_libg2c
 	get_libgcc gcc3
 	get_crtstuff crtstuff3
 	get_gcc_libiberty gcc3
 	get_libobjc libobjc3
 	get_libstdcxx_v3 libstdc++-v3
 	exit 0
 	;;
 *)	echo invalid arguments; exit 1;;
 esac