From 72aad6e65d831c70dccbbef57cf9f24e8ed15d16 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Wed, 13 Jun 2001 14:26:03 +0000 Subject: [PATCH] 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 --- gcc/ChangeLog | 11 +++++++++++ gcc/Makefile.in | 4 ++-- gcc/config/alpha/t-osf4 | 18 +++++++++++------- gcc/config/mips/t-iris6 | 21 +++++++++++++-------- gcc/config/t-slibgcc-elf-ver | 21 +++++++++++++-------- gcc/config/t-slibgcc-sld | 21 +++++++++++++-------- gcc/libgcc-std.ver | 13 +------------ 7 files changed, 64 insertions(+), 45 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f72e394ec72..74435bac8c9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2001-06-13 Zack Weinberg + + * 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 * doc/install.texi: Use more logical markup. Include @node diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 6ed6e3f9283..2b41f3ebd96 100644 --- 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 5c7bd8afe65..e9c451b9c04 100644 --- 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 36a8545e95c..73910122b59 100644 --- 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 88506d9e325..2912e0aa50e 100644 --- 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 50107229e50..35f1bc15fd7 100644 --- 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 c9a085e5ab6..6bc42213291 100644 --- 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 -- 2.30.2