Mon Nov 30 08:20:23 2009 UTC ()
Move these analyzing functions into one place, get_libgcc_new_analyze().


(uebayasi)
diff -r1.34 -r1.35 src/tools/gcc/mknative-gcc

cvs diff -r1.34 -r1.35 src/tools/gcc/mknative-gcc (expand / switch to context diff)
--- src/tools/gcc/mknative-gcc 2009/11/30 08:05:41 1.34
+++ src/tools/gcc/mknative-gcc 2009/11/30 08:20:23 1.35
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: mknative-gcc,v 1.34 2009/11/30 08:05:41 uebayasi Exp $
+#	$NetBSD: mknative-gcc,v 1.35 2009/11/30 08:20:23 uebayasi Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of src/gnu/dist/gcc.
@@ -141,7 +141,7 @@
 	get_libgcc_list_objs_xflags fmx
 }
 
-get_libgcc_libgcc_mk_libs_list_tmpsrcs_files () {
+get_libgcc_list_tmpsrcs () {
 	local _lib=$1
 	local _tmpallsrcs=$( mktemp /tmp/mknative-gcc._tmpallsrcs.XXXXXX )
 
@@ -173,8 +173,35 @@
 	rm -f $_tmpallsrcs
 }
 
+get_libgcc_new_analyze () {
+	mkdir -p $_TOP/${_machine_arch_subdir}
+
+	get_libgcc_list_funcs_asm | \
+	writefile ${libgcc_db_funcs}.S
+
+	for _lib in libgcc_s.so libgcc.a libgcc_eh.a libgcov.a; do
+		get_libgcc_list_funcs_lib $_lib | \
+		writefile ${libgcc_db_funcs}.${_lib%.*}
+	done
+
+	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_new_generate () {
+}
+
+#####
+
 get_libgcc_new () {
 	_subdir="$1"
 
@@ -195,27 +222,9 @@
 	libgcc_srcs_mk_cppflags=${_machine_arch_subdir}/srcs.cppflags.mk
 	libgcc_srcs_mk_copts=${_machine_arch_subdir}/srcs.copts.mk
 
-	# Collect data from gcc/Makefile and gcc/libgcc.mk.
+	get_libgcc_new_analyze
 
-	mkdir -p $_TOP/${_machine_arch_subdir}
-
-	get_libgcc_list_funcs_asm | \
-	writefile ${libgcc_db_funcs}.S
-
-	for _lib in libgcc_s.so libgcc.a libgcc_eh.a libgcov.a; do
-		get_libgcc_list_funcs_lib $_lib | \
-		writefile ${libgcc_db_funcs}.${_lib%.*}
-	done
-
-	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_libgcc_mk_libs_list_tmpsrcs_files $_lib
-	done
+	get_libgcc_new_generate
 }
 
 get_libgcc () {