diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index fc2331da9af..b1ad4781388 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2011-11-21 Hans-Peter Nilsson + + * Makefile.in ($(srcdir)/emutls.c): Explain why it's in LIB2ADDEH + et al. + 2011-11-21 Richard Henderson * crtstuff.c (USE_TM_CLONE_REGISTRY): Default to 1 on ELF. diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in index f0b5a0ecbd5..23b72b92475 100644 --- a/libgcc/Makefile.in +++ b/libgcc/Makefile.in @@ -394,6 +394,9 @@ endif LIB2ADD += enable-execute-stack.c +# While emutls.c has nothing to do with EH, it is in LIB2ADDEH* +# instead of LIB2ADD because that's the way to be sure on some targets +# (e.g. *-*-darwin*) only one copy of it is linked. LIB2ADDEH += $(srcdir)/emutls.c LIB2ADDEHSTATIC += $(srcdir)/emutls.c LIB2ADDEHSHARED += $(srcdir)/emutls.c