This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Kill SHLIB_MULTILIB


SHLIB_MULTILIB could be set by a target fragment to indicate that only one
of a group of multilibs should get libgcc_s.so.  Richard Henderson added
this in 2000 for the Alpha -mieee fragment, but it isn't used there any more
and no one else picked it up.  So garbage collect it.

OK?

-- 
Daniel Jacobowitz
CodeSourcery, LLC

2005-02-11  Daniel Jacobowitz  <dan@codesourcery.com>

	* mklibgcc.in: Don't handle SHLIB_MULTILIB.
	* Makefile.in (libgcc.mk, DRIVER_DEFINES, gcc.o, gccspec.o)
	(protoize.o, unprotoize.o): Don't handle SHLIB_MULTILIB.

2005-02-11  Daniel Jacobowitz  <dan@codesourcery.com>

	* Make-lang.in (gfortranspec.o): Don't pass SHLIB_MULTILIB.

2005-02-11  Daniel Jacobowitz  <dan@codesourcery.com>

	* Make-lang.in (jvspec.o): Don't pass SHLIB_MULTILIB.

2005-02-11  Daniel Jacobowitz  <dan@codesourcery.com>

	* Make-lang.in (g++spec.o): Don't pass SHLIB_MULTILIB.

Index: gcc/gcc/cp/Make-lang.in
===================================================================
--- gcc.orig/gcc/cp/Make-lang.in	2005-02-11 12:28:22.665343000 -0500
+++ gcc/gcc/cp/Make-lang.in	2005-02-11 12:45:43.609430117 -0500
@@ -54,8 +54,7 @@ C++ c++: cc1plus$(exeext)
 .PHONY: C++ c++
 
 g++spec.o: $(srcdir)/cp/g++spec.c $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H) $(CONFIG_H)
-	(SHLIB_LINK='$(SHLIB_LINK)' \
-	SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
+	(SHLIB_LINK='$(SHLIB_LINK)'; \
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \
 		$(INCLUDES) $(srcdir)/cp/g++spec.c)
 
Index: gcc/gcc/mklibgcc.in
===================================================================
--- gcc.orig/gcc/mklibgcc.in	2005-02-11 12:27:49.502272000 -0500
+++ gcc/gcc/mklibgcc.in	2005-02-11 12:50:18.762611520 -0500
@@ -33,7 +33,6 @@
 # EXTRA_MULTILIB_PARTS
 # SHLIB_EXT
 # SHLIB_LINK
-# SHLIB_MULTILIB
 # SHLIB_MKMAP
 # SHLIB_MKMAP_OPTS
 # SHLIB_MAPFILES
@@ -170,50 +169,7 @@ for ml in $MULTILIBS; do
     libunwind_a=$dir/libunwind.a
   fi
   if [ "$SHLIB_LINK" ]; then
-    if [ -z "$SHLIB_MULTILIB" ]; then
-      if [ "$dir" = . ]; then
-	libgcc_eh_a=$dir/libgcc_eh.a
-	libgcc_s_so_base=libgcc_s
-	libgcc_s_so=${libgcc_s_so_base}${SHLIB_EXT}
-	libgcc_s_soname=libgcc_s
-	if [ "$LIBUNWIND" ]; then
-	  libunwind_so_base=libunwind
-	  libunwind_so=${libunwind_so_base}${SHLIB_EXT}
-	  libunwind_soname=libunwind
-	fi
-      else
-	libgcc_eh_a=$dir/libgcc_eh.a
-	libgcc_s_so_base=libgcc_s_${suffix}
-	libgcc_s_so=${libgcc_s_so_base}${SHLIB_EXT}
-	libgcc_s_soname=libgcc_s_${suffix}
-	if [ "$LIBUNWIND" ]; then
-	  libunwind_so_base=libunwind_${suffix}
-	  libunwind_so=${libunwind_so_base}${SHLIB_EXT}
-	fi
-      fi
-
-      if [ -n "$MULTILIB_OSDIRNAMES" ]; then
-	if [ "$dir" != . ]; then
-	  gcc_multilib_dir=`./xgcc -B./ $flags --print-multi-directory`
-	  os_multilib_dir=`./xgcc -B./ $flags --print-multi-os-directory`
-	  shlib_dir="$dir"/
-	  gcc_multilib_sup=`echo $gcc_multilib_dir | sed 's~^[^/]*/~~'`
-	  os_multilib_base=`echo $os_multilib_dir | sed -n "s~/${gcc_multilib_sup}\$~~p"`
-	  if [ -z "$os_multilib_base" ]; then
-	    libgcc_s_soname=libgcc_s
-	    libunwind_soname=libunwind
-	    if [ "$os_multilib_dir" != "." ]; then
-	      shlib_dir_qual="/$os_multilib_dir"
-	    fi
-	  else
-	    libgcc_s_soname=libgcc_s_`echo $gcc_multilib_sup | sed s,/,_,g`
-	    libunwind_soname=libunwind_`echo $gcc_multilib_sup | sed s,/,_,g`
-	    shlib_dir_qual="/$os_multilib_base"
-	  fi
-	fi
-      fi
-
-    elif [ "$SHLIB_MULTILIB" = "$dir" ]; then
+    if [ "$dir" = . ]; then
       libgcc_eh_a=$dir/libgcc_eh.a
       libgcc_s_so_base=libgcc_s
       libgcc_s_so=${libgcc_s_so_base}${SHLIB_EXT}
@@ -223,6 +179,36 @@ for ml in $MULTILIBS; do
 	libunwind_so=${libunwind_so_base}${SHLIB_EXT}
 	libunwind_soname=libunwind
       fi
+    else
+      libgcc_eh_a=$dir/libgcc_eh.a
+      libgcc_s_so_base=libgcc_s_${suffix}
+      libgcc_s_so=${libgcc_s_so_base}${SHLIB_EXT}
+      libgcc_s_soname=libgcc_s_${suffix}
+      if [ "$LIBUNWIND" ]; then
+	libunwind_so_base=libunwind_${suffix}
+	libunwind_so=${libunwind_so_base}${SHLIB_EXT}
+      fi
+    fi
+
+    if [ -n "$MULTILIB_OSDIRNAMES" ]; then
+      if [ "$dir" != . ]; then
+	gcc_multilib_dir=`./xgcc -B./ $flags --print-multi-directory`
+	os_multilib_dir=`./xgcc -B./ $flags --print-multi-os-directory`
+	shlib_dir="$dir"/
+	gcc_multilib_sup=`echo $gcc_multilib_dir | sed 's~^[^/]*/~~'`
+	os_multilib_base=`echo $os_multilib_dir | sed -n "s~/${gcc_multilib_sup}\$~~p"`
+	if [ -z "$os_multilib_base" ]; then
+	  libgcc_s_soname=libgcc_s
+	  libunwind_soname=libunwind
+	  if [ "$os_multilib_dir" != "." ]; then
+	    shlib_dir_qual="/$os_multilib_dir"
+	  fi
+	else
+	  libgcc_s_soname=libgcc_s_`echo $gcc_multilib_sup | sed s,/,_,g`
+	  libunwind_soname=libunwind_`echo $gcc_multilib_sup | sed s,/,_,g`
+	  shlib_dir_qual="/$os_multilib_base"
+	fi
+      fi
     fi
   fi
   libgcc_s_so_extra=
@@ -833,66 +819,49 @@ for ml in $MULTILIBS; do
     echo '	$(INSTALL_DATA)' ${dir}/libgcc_eh.a ${ldir}/
     echo '	$(RANLIB_FOR_TARGET)' ${ldir}/libgcc_eh.a
 
-    if [ -z "$SHLIB_MULTILIB" ]; then
-      if [ "$dir" = . ]; then
-	shlib_base_name=libgcc_s
-	shlibunwind_base_name=libunwind
-      else
-	shlib_base_name=libgcc_s_`echo $dir | sed s,/,_,g`
-	shlibunwind_base_name=libunwind_`echo $dir | sed s,/,_,g`
-      fi
-      shlib_so_name="$shlib_base_name"
-      shlibunwind_so_name="$shlibunwind_base_name"
-      shlib_dir=
-      shlib_slibdir_qual=
-      if [ -n "$MULTILIB_OSDIRNAMES" ]; then
-	gcc_multilib_dir=`./xgcc -B./ $flags --print-multi-directory`
-	os_multilib_dir=`./xgcc -B./ $flags --print-multi-os-directory`
-	if [ "$dir" != . ]; then
-	  shlib_dir="$dir"/
-	fi
-	gcc_multilib_sup=`echo $gcc_multilib_dir | sed 's~^[^/]*/~~'`
-	os_multilib_base=`echo $os_multilib_dir | sed -n "s~/${gcc_multilib_sup}\$~~p"`
-	if [ -z "$os_multilib_base" ]; then
-	  shlib_so_name=libgcc_s
-	  shlibunwind_so_name=libunwind
-	  if [ "$os_multilib_dir" != "." ]; then
-	    shlib_slibdir_qual="/$os_multilib_dir"
-	  fi
-	else
-	  shlib_so_name=libgcc_s_`echo $gcc_multilib_sup | sed s,/,_,g`
-	  shlibunwind_so_name=libunwind_`echo $gcc_multilib_sup | sed s,/,_,g`
-	  shlib_slibdir_qual="/$os_multilib_base"
+    if [ "$dir" = . ]; then
+      shlib_base_name=libgcc_s
+      shlibunwind_base_name=libunwind
+    else
+      shlib_base_name=libgcc_s_`echo $dir | sed s,/,_,g`
+      shlibunwind_base_name=libunwind_`echo $dir | sed s,/,_,g`
+    fi
+    shlib_so_name="$shlib_base_name"
+    shlibunwind_so_name="$shlibunwind_base_name"
+    shlib_dir=
+    shlib_slibdir_qual=
+    if [ -n "$MULTILIB_OSDIRNAMES" ]; then
+      gcc_multilib_dir=`./xgcc -B./ $flags --print-multi-directory`
+      os_multilib_dir=`./xgcc -B./ $flags --print-multi-os-directory`
+      if [ "$dir" != . ]; then
+	shlib_dir="$dir"/
+      fi
+      gcc_multilib_sup=`echo $gcc_multilib_dir | sed 's~^[^/]*/~~'`
+      os_multilib_base=`echo $os_multilib_dir | sed -n "s~/${gcc_multilib_sup}\$~~p"`
+      if [ -z "$os_multilib_base" ]; then
+	shlib_so_name=libgcc_s
+	shlibunwind_so_name=libunwind
+	if [ "$os_multilib_dir" != "." ]; then
+	  shlib_slibdir_qual="/$os_multilib_dir"
 	fi
+      else
+	shlib_so_name=libgcc_s_`echo $gcc_multilib_sup | sed s,/,_,g`
+	shlibunwind_so_name=libunwind_`echo $gcc_multilib_sup | sed s,/,_,g`
+	shlib_slibdir_qual="/$os_multilib_base"
       fi
-      echo "	$SHLIB_INSTALL" \
-	| sed -e "s%@shlib_base_name@%$shlib_base_name%g" \
-	      -e "s%@shlib_so_name@%$shlib_so_name%g" \
-	      -e "s%@shlib_slibdir_qual@%$shlib_slibdir_qual%g"
-      if [ "$LIBUNWIND" ]; then
-	echo "	$SHLIBUNWIND_INSTALL" \
-	   | sed -e "s%@shlib_base_name@%$shlibunwind_base_name%g" \
-		 -e "s%@shlib_so_name@%$shlibunwind_so_name%g" \
-		 -e "s%@shlib_slibdir_qual@%$shlib_slibdir_qual%g"
-	libunwinddir='$(DESTDIR)$(slibdir)$(shlib_slibdir_qual)/$(shlib_dir)'
-	echo '	$(INSTALL_DATA)' ${dir}/libunwind.a ${libunwinddir}/
-	echo '	$(RANLIB_FOR_TARGET)' ${libunwinddir}/libunwind.a
-      fi
-    elif [ "$SHLIB_MULTILIB" = "$dir" ]; then
-      shlib_base_name="libgcc_s";
-      echo "	$SHLIB_INSTALL" \
-	| sed -e "s%@shlib_base_name@%$shlib_base_name%g" \
-	      -e "s%@shlib_so_name@%$shlib_base_name%g" \
-	      -e "s%@shlib_slibdir_qual@%%g"
-      if [ "$LIBUNWIND" ]; then
-	echo "	$SHLIBUNWIND_INSTALL" \
-	   | sed -e "s%@shlib_base_name@%$shlibunwind_base_name%g" \
-		 -e "s%@shlib_so_name@%$shlibunwind_base_name%g" \
-		 -e "s%@shlib_slibdir_qual@%%g"
-	libunwinddir='$(DESTDIR)$(slibdir)'
-	echo '	$(INSTALL_DATA)' ${dir}/libunwind.a ${libunwinddir}/
-	echo '	$(RANLIB_FOR_TARGET)' ${libunwinddir}/libunwind.a
-      fi
+    fi
+    echo "	$SHLIB_INSTALL" \
+      | sed -e "s%@shlib_base_name@%$shlib_base_name%g" \
+	    -e "s%@shlib_so_name@%$shlib_so_name%g" \
+	    -e "s%@shlib_slibdir_qual@%$shlib_slibdir_qual%g"
+    if [ "$LIBUNWIND" ]; then
+      echo "	$SHLIBUNWIND_INSTALL" \
+	 | sed -e "s%@shlib_base_name@%$shlibunwind_base_name%g" \
+	       -e "s%@shlib_so_name@%$shlibunwind_so_name%g" \
+	       -e "s%@shlib_slibdir_qual@%$shlib_slibdir_qual%g"
+      libunwinddir='$(DESTDIR)$(slibdir)$(shlib_slibdir_qual)/$(shlib_dir)'
+      echo '	$(INSTALL_DATA)' ${dir}/libunwind.a ${libunwinddir}/
+      echo '	$(RANLIB_FOR_TARGET)' ${libunwinddir}/libunwind.a
     fi
   fi
 done
Index: gcc/gcc/fortran/Make-lang.in
===================================================================
--- gcc.orig/gcc/fortran/Make-lang.in	2005-02-11 12:28:25.100761000 -0500
+++ gcc/gcc/fortran/Make-lang.in	2005-02-11 12:45:48.267315918 -0500
@@ -87,8 +87,7 @@ F95 f95: f951$(exeext)
 .PHONY: F95 f95
 
 gfortranspec.o: $(srcdir)/fortran/gfortranspec.c $(SYSTEM_H) $(TM_H) $(GCC_H) $(CONFIG_H)
-	(SHLIB_LINK='$(SHLIB_LINK)' \
-	SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
+	(SHLIB_LINK='$(SHLIB_LINK)'; \
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \
 		$(INCLUDES) $(srcdir)/fortran/gfortranspec.c)
 
Index: gcc/gcc/Makefile.in
===================================================================
--- gcc.orig/gcc/Makefile.in	2005-02-11 12:27:46.386017000 -0500
+++ gcc/gcc/Makefile.in	2005-02-11 12:44:37.060349131 -0500
@@ -1227,7 +1227,6 @@ libgcc.mk: config.status Makefile mklibg
 	SHLIB_LINK='$(SHLIB_LINK)' \
 	SHLIB_INSTALL='$(SHLIB_INSTALL)' \
 	SHLIB_EXT='$(SHLIB_EXT)' \
-	SHLIB_MULTILIB='$(SHLIB_MULTILIB)' \
 	SHLIB_MKMAP='$(SHLIB_MKMAP)' \
 	SHLIB_MKMAP_OPTS='$(SHLIB_MKMAP_OPTS)' \
 	SHLIB_MAPFILES='$(SHLIB_MAPFILES)' \
@@ -1481,20 +1480,17 @@ DRIVER_DEFINES = \
   -DTOOLDIR_BASE_PREFIX=\"$(unlibsubdir)/../\" \
   @TARGET_SYSTEM_ROOT_DEFINE@ \
   $(VALGRIND_DRIVER_DEFINES) \
-  `test "X$${SHLIB_LINK}" = "X" || test "@enable_shared@" != "yes" || echo "-DENABLE_SHARED_LIBGCC"` \
-  `test "X$${SHLIB_MULTILIB}" = "X" || echo "-DNO_SHARED_LIBGCC_MULTILIB"`
+  `test "X$${SHLIB_LINK}" = "X" || test "@enable_shared@" != "yes" || echo "-DENABLE_SHARED_LIBGCC"`
 
 gcc.o: gcc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) intl.h multilib.h \
     Makefile $(lang_specs_files) specs.h prefix.h $(GCC_H)
-	(SHLIB_LINK='$(SHLIB_LINK)' \
-	SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
+	(SHLIB_LINK='$(SHLIB_LINK)'; \
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
   $(DRIVER_DEFINES) \
   -c $(srcdir)/gcc.c $(OUTPUT_OPTION))
 
 gccspec.o: gccspec.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H)
-	(SHLIB_LINK='$(SHLIB_LINK)' \
-	SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
+	(SHLIB_LINK='$(SHLIB_LINK)'; \
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
   $(DRIVER_DEFINES) \
   -c $(srcdir)/gccspec.c $(OUTPUT_OPTION))
@@ -2694,16 +2690,14 @@ unprotoize$(exeext): unprotoize.o $(PROT
 
 protoize.o: protoize.c $(srcdir)/../include/getopt.h $(CONFIG_H) $(SYSTEM_H) \
    coretypes.h $(TM_H) Makefile version.h
-	(SHLIB_LINK='$(SHLIB_LINK)' \
-	SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
+	(SHLIB_LINK='$(SHLIB_LINK)'; \
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
 	  $(DRIVER_DEFINES) \
 	  $(srcdir)/protoize.c $(OUTPUT_OPTION))
 
 unprotoize.o: protoize.c $(srcdir)/../include/getopt.h \
    $(CONFIG_H) $(SYSTEM_H) Makefile version.h
-	(SHLIB_LINK='$(SHLIB_LINK)' \
-	SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
+	(SHLIB_LINK='$(SHLIB_LINK)'; \
 	$(CC) -c -DUNPROTOIZE $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
 	  $(DRIVER_DEFINES) \
 	  $(srcdir)/protoize.c $(OUTPUT_OPTION))
Index: gcc/gcc/java/Make-lang.in
===================================================================
--- gcc.orig/gcc/java/Make-lang.in	2005-02-11 12:28:26.361459000 -0500
+++ gcc/gcc/java/Make-lang.in	2005-02-11 12:45:52.721250505 -0500
@@ -60,8 +60,7 @@ JAVA_TARGET_INDEPENDENT_BIN_TOOLS = gcjh
 
 jvspec.o: $(srcdir)/java/jvspec.c $(SYSTEM_H) coretypes.h $(TM_H) \
   $(GCC_H) $(CONFIG_H)
-	(SHLIB_LINK='$(SHLIB_LINK)' \
-	SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
+	(SHLIB_LINK='$(SHLIB_LINK)'; \
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \
 		$(INCLUDES) $(srcdir)/java/jvspec.c $(OUTPUT_OPTION))
 


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]