diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-08-22 09:36:23 +0100 |
|---|---|---|
| committer | Joseph Myers <jsm28@gcc.gnu.org> | 2012-08-22 09:36:23 +0100 |
| commit | 130e00bd2407957f9cc32f7c107502848016166e (patch) | |
| tree | 1ae2eef23131163eea19446e9fa59d3a68dc846d | |
| parent | d8f8a0b41e8cb34f205b58bea6080da4e6cfb337 (diff) | |
| download | gcc-130e00bd2407957f9cc32f7c107502848016166e.zip gcc-130e00bd2407957f9cc32f7c107502848016166e.tar.gz gcc-130e00bd2407957f9cc32f7c107502848016166e.tar.bz2 | |
Makefile.in (vis_hide, [...]): Do not make definitions depend on --enable-shared.
* Makefile.in (vis_hide, gen-hide-list): Do not make definitions
depend on --enable-shared.
($(lib1asmfuncs-o)): Use %.vis files independent of
--enable-shared.
* static-object.mk ($(base)$(objext), $(base).vis)
($(base)_s$(objext)): Use same rules for visibility handling as in
shared-object.mk.
From-SVN: r190588
| -rw-r--r-- | libgcc/ChangeLog | 10 | ||||
| -rw-r--r-- | libgcc/Makefile.in | 16 | ||||
| -rw-r--r-- | libgcc/static-object.mk | 10 |
3 files changed, 22 insertions, 14 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index eaa4f29..0d4d78d 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,13 @@ +2012-08-22 Joseph Myers <joseph@codesourcery.com> + + * Makefile.in (vis_hide, gen-hide-list): Do not make definitions + depend on --enable-shared. + ($(lib1asmfuncs-o)): Use %.vis files independent of + --enable-shared. + * static-object.mk ($(base)$(objext), $(base).vis) + ($(base)_s$(objext)): Use same rules for visibility handling as in + shared-object.mk. + 2012-08-21 Ian Lance Taylor <iant@google.com> * config/i386/morestack.S (__morestack_non_split): Increase amount diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in index 73f57d6..b37fdb9 100644 --- a/libgcc/Makefile.in +++ b/libgcc/Makefile.in @@ -363,6 +363,7 @@ ifeq ($(enable_shared),yes) ifneq ($(LIBUNWIND),) install-libunwind = install-libunwind endif +endif # For -fvisibility=hidden. We need both a -fvisibility=hidden on # the command line, and a #define to prevent libgcc2.h etc from @@ -386,11 +387,8 @@ else gen-hide-list = echo > $@ endif -else -# Not enable_shared. +ifneq ($(enable_shared),yes) iterator = $(srcdir)/empty.mk $(patsubst %,$(srcdir)/static-object.mk,$(iter-items)) -vis_hide = -gen-hide-list = echo > \$@ endif LIB2ADD += enable-execute-stack.c @@ -439,7 +437,6 @@ LIB2_DIVMOD_FUNCS := $(filter-out $(LIB2FUNCS_EXCLUDE) $(LIB1ASMFUNCS), \ $(LIB2_DIVMOD_FUNCS)) # Build "libgcc1" (assembly) components. -ifeq ($(enable_shared),yes) lib1asmfuncs-o = $(patsubst %,%$(objext),$(LIB1ASMFUNCS)) $(lib1asmfuncs-o): %$(objext): $(srcdir)/config/$(LIB1ASMSRC) %.vis @@ -451,14 +448,9 @@ libgcc-objects += $(lib1asmfuncs-o) lib1asmfuncs-s-o = $(patsubst %,%_s$(objext),$(LIB1ASMFUNCS)) $(lib1asmfuncs-s-o): %_s$(objext): $(srcdir)/config/$(LIB1ASMSRC) $(gcc_s_compile) -DL$* -xassembler-with-cpp -c $< -libgcc-s-objects += $(lib1asmfuncs-s-o) - -else +ifeq ($(enable_shared),yes) -lib1asmfuncs-o = $(patsubst %,%$(objext),$(LIB1ASMFUNCS)) -$(lib1asmfuncs-o): %$(objext): $(srcdir)/config/$(LIB1ASMSRC) - $(gcc_compile) -DL$* -xassembler-with-cpp -c $< -libgcc-objects += $(lib1asmfuncs-o) +libgcc-s-objects += $(lib1asmfuncs-s-o) endif diff --git a/libgcc/static-object.mk b/libgcc/static-object.mk index 930f009..4f53636 100644 --- a/libgcc/static-object.mk +++ b/libgcc/static-object.mk @@ -24,7 +24,13 @@ $(error Unsupported file type: $o) endif endif -$(base)$(objext): $o - $(gcc_compile) -c -xassembler-with-cpp $< +$(base)$(objext): $o $(base).vis + $(gcc_compile) -c -xassembler-with-cpp -include $*.vis $< + +$(base).vis: $(base)_s$(objext) + $(gen-hide-list) + +$(base)_s$(objext): $o + $(gcc_s_compile) -c -xassembler-with-cpp $< endif |