From ee95744f315cfe57a7efc156fe1c91423dfe1f7f Mon Sep 17 00:00:00 2001 From: "Herman A.J. ten Brugge" Date: Sun, 25 Jun 2000 01:34:25 +0200 Subject: [PATCH] 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 | 5 +++++ gcc/mklibgcc.in | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f8e1532..7487454 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2000-06-25 Herman A.J. ten Brugge + + * mklibgcc.in: Prefer LIB1ASMFUNCS over LIB2FUNCS when generating + libgcc.a. + 2000-06-24 Marc Espie * collect2.c (resolve_lib_name): Move '/' check to more rational place. diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in index c46c638..761464f 100644 --- a/gcc/mklibgcc.in +++ b/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 -- 2.7.4