diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2002-05-09 23:01:55 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2002-05-09 23:01:55 +0200 |
| commit | 2937267b6a53ca3c5e1aa45339634c2901f844cb (patch) | |
| tree | 90b85aa28a1ca0a270f78459d62ab64da5663ee3 /gcc/config/t-slibgcc-sld | |
| parent | 086c0f96be83e383209026548c6929be7e160f1c (diff) | |
| download | gcc-2937267b6a53ca3c5e1aa45339634c2901f844cb.zip gcc-2937267b6a53ca3c5e1aa45339634c2901f844cb.tar.gz gcc-2937267b6a53ca3c5e1aa45339634c2901f844cb.tar.bz2 | |
re PR target/6429 (libgcc_s problem on dual 32/64-bit arches)
PR target/6429
* Makefile.in (libgcc.mk): Pass SHLIB_SLIBDIR_SUFFIXES to mklibgcc.
* mklibgcc.in: If SHLIB_SLIBDIR_SUFFIXES is defined, put libgcc_s
shared libraries into multilib dirs, with SONAME libgcc_s.so.1 for
base multilibs.
* config/t-slibgcc-elf-ver (SHLIB_LINK): Adjust for the above.
* config/t-slibgcc-sld (SHLIB_LINK): Likewise.
* config/i386/t-linux64 (SHLIB_SLIBDIR_SUFFIXES): Define.
* config/sparc/t-linux64 (SHLIB_SLIBDIR_SUFFIXES): Define.
* config/sparc/t-sol2-64 (SHLIB_SLIBDIR_SUFFIXES): Define.
* lib/g77.exp (g77_link_flags): Append all multilib dirs containing
libgcc_s*.so.1 below gcc object dir to LD_LIBRARY_PATH.
* lib/g++.exp (g++_link_flags): Likewise.
* lib/objc.exp (objc_target_compile): Likewise.
* testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init): Append all
multilib dirs containing libgcc_s*.so.1 below gcc object dir to
LD_LIBRARY_PATH.
* testsuite/lib/libjava.exp (libjava_arguments): Append all
multilib dirs containing libgcc_s*.so.1 below gcc object dir to
LD_LIBRARY_PATH.
From-SVN: r53345
Diffstat (limited to 'gcc/config/t-slibgcc-sld')
| -rw-r--r-- | gcc/config/t-slibgcc-sld | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/gcc/config/t-slibgcc-sld b/gcc/config/t-slibgcc-sld index 35f1bc1..c11a572 100644 --- a/gcc/config/t-slibgcc-sld +++ b/gcc/config/t-slibgcc-sld @@ -1,21 +1,27 @@ # 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_SOLINK = @shlib_base_name@.so +SHLIB_SONAME = @shlib_so_name@.so.1 +SHLIB_NAME = @shlib_dir@@shlib_so_name@.so.1 SHLIB_MAP = @shlib_map_file@ SHLIB_OBJS = @shlib_objs@ +SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ -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) + rm -f $(SHLIB_SOLINK) && \ + $(LN_S) $(SHLIB_NAME) $(SHLIB_SOLINK) # $(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_NAME) $$(slibdir)/$(SHLIB_SONAME); \ - rm -f $$(slibdir)/$(SHLIB_NAME); \ - $(LN_S) $(SHLIB_SONAME) $$(slibdir)/$(SHLIB_NAME) +SHLIB_INSTALL = \ + $$(SHELL) $$(srcdir)/mkinstalldirs $$(slibdir)$(SHLIB_SLIBDIR_QUAL); \ + $(INSTALL_DATA) $(SHLIB_NAME) \ + $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \ + rm -f $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \ + $(LN_S) $(SHLIB_SONAME) \ + $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) SHLIB_MKMAP = $(srcdir)/mkmap-symver.awk SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver |