libgcc: apply LIB2FUNCS_EXCLUDE logic to LIB2FUNCS_ST

One target file (config/c6x/t-elf) lists _printf and _gcc_bcmp in
LIB2FUNCS_EXCLUDE, but that does not have any effect, since those are
not filtered away from LIB2FUNCS_ST. Another option is to do as in
config/rl78/t-rl78, which explicitly sets LIB2FUNCS_ST

# Remove __gcc_bcmp from LIB2FUNCS_ST
LIB2FUNCS_ST = _eprintf

but honouring LIB2FUNCS_EXCLUDE also for LIB2FUNCS_ST seems more
natural.

From-SVN: r265246

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 1883640915aac22c3734b923cfe37ae64a215d30..0a69914e142755a04411aacb3669193f13779a52 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,7 @@
+2018-10-17  Rasmus Villemoes  <rv@rasmusvillemoes.dk>
+
+       * Makefile.in (LIB2FUNCS_ST): Filter out LIB2FUNCS_EXCLUDE.
+
 2018-10-12  Olivier Hainque  <hainque@adacore.com>
 
        * config/rs6000/ibm-ldouble.c: Augment the toplevel guard with

diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
index 0766de585003946099fcff1558dbbaa390df3dab..aeb96c475e2b4ce0c6276189db17fdc68d0d074b 100644 (file)
--- a/libgcc/Makefile.in
+++ b/libgcc/Makefile.in
@@ -472,6 +472,8 @@ lib2funcs := $(filter-out $(LIB2FUNCS_EXCLUDE) $(LIB1ASMFUNCS),$(lib2funcs))
 LIB2_DIVMOD_FUNCS := $(filter-out $(LIB2FUNCS_EXCLUDE) $(LIB1ASMFUNCS), \
                       $(LIB2_DIVMOD_FUNCS))
 
+LIB2FUNCS_ST := $(filter-out $(LIB2FUNCS_EXCLUDE),$(LIB2FUNCS_ST))
+
 # Build "libgcc1" (assembly) components.
 
 lib1asmfuncs-o = $(patsubst %,%$(objext),$(LIB1ASMFUNCS))