mklibgcc.in: Prefer LIB1ASMFUNCS over LIB2FUNCS when generating libgcc.a.

	* mklibgcc.in: Prefer LIB1ASMFUNCS over LIB2FUNCS when generating
	libgcc.a.

From-SVN: r34690

gcc/ChangeLog

+2000-06-25 Herman A.J. ten Brugge <Haj.Ten.Brugge@net.HCC.nl>
+
+	* mklibgcc.in: Prefer LIB1ASMFUNCS over LIB2FUNCS when generating
+	libgcc.a.
+
 2000-06-24  Marc Espie <espie@cvs.openbsd.org>
 
 	* collect2.c (resolve_lib_name): Move '/' check to more rational place.

gcc/mklibgcc.in

@@ -97,6 +97,12 @@ case X"$LIBGCC1" in
         echo ${out}: stmp-dirs '$(srcdir)/config/$(LIB1ASMSRC)'
 	echo "	$gcc_compile" $flags -DL$name -xassembler-with-cpp \
 	  -c '$(srcdir)/config/$(LIB1ASMSRC)' -o $out
+
+	# Remove any objects from LIB2FUNCS that are defined as optimized
+	# assembly code in LIB1ASMFUNCS.
+	LIB2FUNCS=`echo $LIB2FUNCS | sed -e 's/^'$name' //' \
+				         -e 's/ '$name' //' \
+					 -e 's/ '$name'$//'`
       done
       libgcc1_objs="$libgcc1_objs ${name}${objext}"
     done