Makefile.in: Move _bb and __gcc_bcmp to LIB2FUNCS_ST.

	* Makefile.in: Move _bb and __gcc_bcmp to LIB2FUNCS_ST.
	* libgcc-std.ver: Take out __bb* and __gcc_bcmp.

	* config/t-slibgcc-elf-ver, config/t-slibgcc-sld,
	config/alpha/t-osf4, config/mips/t-iris6: Extract all
	references to @shlib_map_file@, @shlib_objs@, or
	@shlib_base_name@ to Makefile variables.
	Bump soname version of libgcc to 1.

From-SVN: r43316

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f72e394ec723e18c093342d66d551d823dbb690a..74435bac8c93ae18a3b9b8fc32249a4de8d92b83 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2001-06-13  Zack Weinberg  <zackw@stanford.edu>
+
+       * Makefile.in: Move _bb and __gcc_bcmp to LIB2FUNCS_ST.
+       * libgcc-std.ver: Take out __bb* and __gcc_bcmp.                        
+
+       * config/t-slibgcc-elf-ver, config/t-slibgcc-sld,
+       config/alpha/t-osf4, config/mips/t-iris6: Extract all
+       references to @shlib_map_file@, @shlib_objs@, or     
+       @shlib_base_name@ to Makefile variables.
+       Bump soname version of libgcc to 1.
+
 2001-06-13  Joseph S. Myers  <jsm28@cam.ac.uk>
 
        * doc/install.texi: Use more logical markup.  Include @node

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 6ed6e3f9283d48aa92c0cc02eeed9ee54b347c95..2b41f3ebd96b1806f02014d7bba2c652494e4a78 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -782,13 +782,13 @@ LIB2FUNCS = _muldi3 _divdi3 _moddi3 _udivdi3 _umoddi3 _negdi2 \
     _fixunsdfsi _fixunssfsi _fixunsdfdi _fixdfdi _fixunssfdi _fixsfdi \
     _fixxfdi _fixunsxfdi _floatdixf _fixunsxfsi \
     _fixtfdi _fixunstfdi _floatditf \
-    __gcc_bcmp _bb _clear_cache _trampoline __main _exit \
+    _clear_cache _trampoline __main _exit \
     _absvsi2 _absvdi2 _addvsi3 _addvdi3 _subvsi3 _subvdi3 \
     _mulvsi3 _mulvdi3 _negvsi2 _negvdi2 \
     _ctors
 
 # Defined in libgcc2.c, included only in the static library.
-LIB2FUNCS_ST = _eprintf
+LIB2FUNCS_ST = _eprintf _bb __gcc_bcmp 
 
 FPBIT_FUNCS = _pack_sf _unpack_sf _addsub_sf _mul_sf _div_sf \
     _fpcmp_parts_sf _compare_sf _eq_sf _ne_sf _gt_sf _ge_sf \

diff --git a/gcc/config/alpha/t-osf4 b/gcc/config/alpha/t-osf4
index 5c7bd8afe658d709c205b7a83abce7ea0eb93ebf..e9c451b9c04dfd7bc78d82161a4f294e8f5d299a 100644 (file)
--- a/gcc/config/alpha/t-osf4
+++ b/gcc/config/alpha/t-osf4
@@ -6,13 +6,17 @@ TARGET_LIBGCC2_CFLAGS = -fPIC
 
 # Build a shared libgcc library.
 SHLIB_EXT = .so
+SHLIB_NAME = @shlib_base_name@.so
+SHLIB_SONAME = @shlib_base_name@.so.1
+SHLIB_OBJS = @shlib_objs@
+
 SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
-       -Wl,-msym -Wl,-set_version,gcc.0 -Wl,-soname,@shlib_base_name@.so.0 \
-       -o @shlib_base_name@.so @multilib_flags@ @shlib_objs@ -lc && \
-       rm -f @shlib_base_name@.so.0 && \
-       $(LN_S) @shlib_base_name@.so @shlib_base_name@.so.0
+       -Wl,-msym -Wl,-set_version,gcc.1 -Wl,-soname,$(SHLIB_SONAME) \
+       -o $(SHLIB_NAME) @multilib_flags@ $(SHLIB_OBJS) -lc && \
+       rm -f $(SHLIB_SONAME) && \
+       $(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME)
 # $(slibdir) double quoted to protect it from expansion while building
 # libgcc.mk.  We want this delayed until actual install time.
-SHLIB_INSTALL = $(INSTALL_DATA) @shlib_base_name@.so $$(slibdir)/@shlib_base_name@.so.0; \
-       rm -f $$(slibdir)/@shlib_base_name@.so; \
-       $(LN_S) @shlib_base_name@.so.0 $$(slibdir)/@shlib_base_name@.so
+SHLIB_INSTALL = $(INSTALL_DATA) $(SHLIB_NAME) $$(slibdir)/$(SHLIB_SONAME); \
+       rm -f $$(slibdir)/$(SHLIB_NAME); \
+       $(LN_S) $(SHLIB_SONAME) $$(slibdir)/$(SHLIB_NAME)

diff --git a/gcc/config/mips/t-iris6 b/gcc/config/mips/t-iris6
index 36a8545e95c778e86e24f359c977646350fdc598..73910122b59e46b2ef72faa7067859dcaaab0263 100644 (file)
--- a/gcc/config/mips/t-iris6
+++ b/gcc/config/mips/t-iris6
@@ -16,21 +16,26 @@ CRTSTUFF_T_CFLAGS=-g1
 
 # Build a shared libgcc library.
 SHLIB_EXT = .so
+SHLIB_NAME = @shlib_base_name@.so
+SHLIB_SONAME = @shlib_base_name@.so.1
+SHLIB_MAP = @shlib_map_file@
+SHLIB_OBJS = @shlib_objs@
+
 SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
-        -Wl,-soname,@shlib_base_name@.so.0 \
-       -o @shlib_base_name@.so @multilib_flags@ @shlib_objs@ -lc && \
-       rm -f @shlib_base_name@.so.0 && \
-       $(LN_S) @shlib_base_name@.so @shlib_base_name@.so.0
+        -Wl,-soname,$(SHLIB_SONAME) \
+       -o $(SHLIB_NAME) @multilib_flags@ $(SHLIB_OBJS) -lc && \
+       rm -f $(SHLIB_SONAME) && \
+       $(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME)
 # ??? Irix 6.5 seems to eat the option fine (if we somehow remove the
 # -hidden_symbol option, which is documented to be ignored in conjunction
 # with -exports_file), but fails to actually hide any symbols.
-#      -Wl,-exports_file,@shlib_map_file@
+#      -Wl,-exports_file,$(SHLIB_MAP)
 
 # $(slibdir) double quoted to protect it from expansion while building
 # libgcc.mk.  We want this delayed until actual install time.
-SHLIB_INSTALL = $(INSTALL_DATA) @shlib_base_name@.so $$(slibdir)/@shlib_base_name@.so.0; \
-       rm -f $$(slibdir)/@shlib_base_name@.so; \
-       $(LN_S) @shlib_base_name@.so.0 $$(slibdir)/@shlib_base_name@.so
+SHLIB_INSTALL = $(INSTALL_DATA) $(SHLIB_NAME) $$(slibdir)/$(SHLIB_SONAME); \
+       rm -f $$(slibdir)/$(SHLIB_NAME); \
+       $(LN_S) $(SHLIB_SONAME) $$(slibdir)/$(SHLIB_NAME)
 SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
 SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver 
 

diff --git a/gcc/config/t-slibgcc-elf-ver b/gcc/config/t-slibgcc-elf-ver
index 88506d9e325fc4210152d502645cc83ee8fb44f6..2912e0aa50ea7c9b9eff063eea6eaf473f27197f 100644 (file)
--- a/gcc/config/t-slibgcc-elf-ver
+++ b/gcc/config/t-slibgcc-elf-ver
@@ -2,16 +2,21 @@
 # with the GNU linker.
 
 SHLIB_EXT = .so
+SHLIB_NAME = @shlib_base_name@.so
+SHLIB_SONAME = @shlib_base_name@.so.1
+SHLIB_MAP = @shlib_map_file@
+SHLIB_OBJS = @shlib_objs@
+
 SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
-       -Wl,--soname=@shlib_base_name@.so.0 \
-       -Wl,--version-script=@shlib_map_file@ \
-       -o @shlib_base_name@.so @multilib_flags@ @shlib_objs@ -lc && \
-       rm -f @shlib_base_name@.so.0 && \
-       $(LN_S) @shlib_base_name@.so @shlib_base_name@.so.0
+       -Wl,--soname=$(SHLIB_SONAME) \
+       -Wl,--version-script=$(SHLIB_MAP) \
+       -o $(SHLIB_NAME) @multilib_flags@ $(SHLIB_OBJS) -lc && \
+       rm -f $(SHLIB_SONAME) && \
+       $(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME)
 # $(slibdir) double quoted to protect it from expansion while building
 # libgcc.mk.  We want this delayed until actual install time.
-SHLIB_INSTALL = $(INSTALL_DATA) @shlib_base_name@.so $$(slibdir)/@shlib_base_name@.so.0; \
-       rm -f $$(slibdir)/@shlib_base_name@.so; \
-       $(LN_S) @shlib_base_name@.so.0 $$(slibdir)/@shlib_base_name@.so
+SHLIB_INSTALL = $(INSTALL_DATA) $(SHLIB_NAME) $$(slibdir)/$(SHLIB_SONAME); \
+       rm -f $$(slibdir)/$(SHLIB_NAME); \
+       $(LN_S) $(SHLIB_SONAME) $$(slibdir)/$(SHLIB_NAME)
 SHLIB_MKMAP = $(srcdir)/mkmap-symver.awk
 SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver

diff --git a/gcc/config/t-slibgcc-sld b/gcc/config/t-slibgcc-sld
index 50107229e5016f82149908dcdaf51820675eeb12..35f1bc15fd7384c3d977b7f4729db10002335f7a 100644 (file)
--- a/gcc/config/t-slibgcc-sld
+++ b/gcc/config/t-slibgcc-sld
@@ -1,16 +1,21 @@
 # Build a shared libgcc library with the Solaris linker.
 
 SHLIB_EXT = .so
+SHLIB_NAME = @shlib_base_name@.so
+SHLIB_SONAME = @shlib_base_name@.so.1
+SHLIB_MAP = @shlib_map_file@
+SHLIB_OBJS = @shlib_objs@
+
 SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
-       -Wl,-h,@shlib_base_name@.so.0 -Wl,-z,text -Wl,-z,defs \
-       -Wl,-M,@shlib_map_file@ -o @shlib_base_name@.so \
-       @multilib_flags@ @shlib_objs@ -lc && \
-       rm -f @shlib_base_name@.so.0 && \
-       $(LN_S) @shlib_base_name@.so @shlib_base_name@.so.0
+       -Wl,-h,$(SHLIB_SONAME) -Wl,-z,text -Wl,-z,defs \
+       -Wl,-M,$(SHLIB_MAP) -o $(SHLIB_NAME) \
+       @multilib_flags@ $(SHLIB_OBJS) -lc && \
+       rm -f $(SHLIB_SONAME) && \
+       $(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME)
 # $(slibdir) double quoted to protect it from expansion while building
 # libgcc.mk.  We want this delayed until actual install time.
-SHLIB_INSTALL = $(INSTALL_DATA) @shlib_base_name@.so $$(slibdir)/@shlib_base_name@.so.0; \
-       rm -f $$(slibdir)/@shlib_base_name@.so; \
-       $(LN_S) @shlib_base_name@.so.0 $$(slibdir)/@shlib_base_name@.so
+SHLIB_INSTALL = $(INSTALL_DATA) $(SHLIB_NAME) $$(slibdir)/$(SHLIB_SONAME); \
+       rm -f $$(slibdir)/$(SHLIB_NAME); \
+       $(LN_S) $(SHLIB_SONAME) $$(slibdir)/$(SHLIB_NAME)
 SHLIB_MKMAP = $(srcdir)/mkmap-symver.awk
 SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver

diff --git a/gcc/libgcc-std.ver b/gcc/libgcc-std.ver
index c9a085e5ab620e5c86eb7d0a38059a3d82f98784..6bc4221329131126f1586365bf43c93c254d0763 100644 (file)
--- a/gcc/libgcc-std.ver
+++ b/gcc/libgcc-std.ver
@@ -141,19 +141,8 @@ GCC_3.0 {
   __floattixf
   __floattitf
 
-  # Basic block profile symbols.
-  # ??? Some of these are for `-a', which ought to die.
-  __bb
-  __bb_exit_func
-  __bb_fork_func
-  __bb_init_func
-  __bb_init_trace_func
-  __bb_trace_func
-  __bb_trace_ret
-
-  # ??? Symbols that perhaps unused should be nuked.
+  # Used to deal with trampoline initialization on some platforms
   __clear_cache
-  __gcc_bcmp
 
   # EH symbols
   _Unwind_DeleteException