From 130e00bd2407957f9cc32f7c107502848016166e Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Wed, 22 Aug 2012 09:36:23 +0100
Subject: [PATCH] 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
---
 libgcc/ChangeLog        | 10 ++++++++++
 libgcc/Makefile.in      | 16 ++++------------
 libgcc/static-object.mk | 10 ++++++++--
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index eaa4f2904a1..0d4d78dceaa 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 73f57d65658..b37fdb90e0a 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 930f009cd42..4f536369f0d 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
-- 
2.30.2