OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Joseph Myers 2012-08-22 09:36:23 +01:00 committed by Joseph Myers
parent d8f8a0b41e
commit 130e00bd24
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libgcc/ChangeLog
View File

@ -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

16
libgcc/Makefile.in
View File

@ -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,15 +448,10 @@ 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 $<
ifeq ($(enable_shared),yes)
libgcc-s-objects += $(lib1asmfuncs-s-o)
else
lib1asmfuncs-o = $(patsubst %,%$(objext),$(LIB1ASMFUNCS))
$(lib1asmfuncs-o): %$(objext): $(srcdir)/config/$(LIB1ASMSRC)
$(gcc_compile) -DL$* -xassembler-with-cpp -c $<
libgcc-objects += $(lib1asmfuncs-o)
endif
# Build lib2funcs. For the static library also include LIB2FUNCS_ST.

10
libgcc/static-object.mk
View File

@ -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