Mon Nov 30 09:33:36 2009 UTC ()

For each library, generate a makefile of the list of template sources too.


(uebayasi)

diff -r1.36 -r1.37 src/tools/gcc/mknative-gcc

--- src/tools/gcc/mknative-gcc 2009/11/30 09:32:13	1.36
+++ src/tools/gcc/mknative-gcc 2009/11/30 09:33:36	1.37

 @@ -1,15 +1,15 @@
 #!/bin/sh
-#	$NetBSD: mknative-gcc,v 1.36 2009/11/30 09:32:13 uebayasi Exp $
+#	$NetBSD: mknative-gcc,v 1.37 2009/11/30 09:33:36 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`
 @@ -187,42 +187,72 @@ get_libgcc_new_analyze () {
 	get_libgcc_list_objs_libs | writefile ${libgcc_db_objs_libs}
 	get_libgcc_list_objs_srcs | writefile ${libgcc_db_objs_srcs}
 	get_libgcc_list_objs_tmpsrcs | writefile ${libgcc_db_objs_tmpsrcs}
 	get_libgcc_list_objs_cppflags | writefile ${libgcc_db_objs_cppflags}
 	get_libgcc_list_objs_copts | writefile ${libgcc_db_objs_copts}
 	for _lib in libgcc_s.so libgcc.a libgcc_eh.a libgcov.a; do
 		get_libgcc_list_tmpsrcs $_lib
 	done
+}
 #####
 get_libgcc_gen_tmpsrcs_tmpsrcs () {
 	local _lib=$1
 	printf '\n'
 	printf 'TMPSRCS.%s = \\\n' $_lib
 	sed -e 's,^,	,; s,$, \\,' $_TOP/${libgcc_db_tmpsrcs}.tmpsrcs.${_lib%.*}
+}
 get_libgcc_gen_tmpsrcs_tmpfpsrcs () {
 	local _lib=$1
 	printf '\n'
 	printf 'TMPFPSRCS.%s = \\\n' $_lib
 	sed -e 's,^,	,; s,$, \\,' $_TOP/${libgcc_db_tmpsrcs}.tmpfpsrcs.${_lib%.*}
+}
 get_libgcc_gen_tmpsrcs_tmpasmsrcs () {
 	local _lib=$1
 	printf '\n'
 	printf 'TMPASMSRCS.%s = \\\n' $_lib
 	sed -e 's,^,	,; s,$, \\,' $_TOP/${libgcc_db_tmpsrcs}.tmpasmsrcs.${_lib%.*} | \
 	sed -e 's,LIB1ASMSRC,G_&,'
+}
 get_libgcc_gen_srcs () {
 	local _lib=$1
 	printf '\n'
 	printf 'SRCS.%s = \\\n' $_lib
+	{
 		comm -23 $_TOP/${libgcc_db_funcs}.${_lib%.*} $_TOP/${libgcc_db_funcs}.S | \
 		sed -e 's,$,.c,; s,^,tmp_,'
 		comm -12 $_TOP/${libgcc_db_funcs}.${_lib%.*} $_TOP/${libgcc_db_funcs}.S | \
 		sed -e 's,$,.S,; s,^,tmp_,'
 	} | sort | \
 	sed -e 's,^,	,; s,$, \\,'
+}
 get_libgcc_new_generate () {
 	for _lib in libgcc_s.so libgcc.a libgcc_eh.a libgcov.a; do
 		for _tmp in tmpsrcs tmpfpsrcs tmpasmsrcs; do
 			eval get_libgcc_gen_tmpsrcs_${_tmp} $_lib | \
 			write_mk ${_machine_arch_subdir}/${_lib%.*}.tmpsrcs.${_tmp}.mk
 		done
 		get_libgcc_gen_srcs $_lib | \
 		write_mk ${_machine_arch_subdir}/${_lib%.*}.srcs.mk
 	done
+}
 #####
 get_libgcc_new () {
 	_subdir="$1"
 	# List of generated files.
 	_machine_arch_subdir=gnu/lib/lib$_subdir/arch${_archsubdir}/$MACHINE_ARCH