[PATCH 3/5] libgloss: drop unused multi-build logic

Mike Frysinger vapier@gentoo.org
Wed Dec 14 02:36:58 GMT 2022


Now that aarch64 & arm have migrated off this, we can punt it.
---
 libgloss/doc/porting.texi |  4 +--
 libgloss/multi-build.in   | 66 ---------------------------------------
 2 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 libgloss/multi-build.in

diff --git a/libgloss/doc/porting.texi b/libgloss/doc/porting.texi
index 496fae352148..15f214d026a4 100644
--- a/libgloss/doc/porting.texi
+++ b/libgloss/doc/porting.texi
@@ -398,9 +398,7 @@ any target that has migrated to @value{automake}.
 
 Libgloss automatically builds itself for all multilib configurations that the
 active toolchain supports.  This logic is provided by common code from the
-combined toolchain source tree.  This should @strong{not} be confused with the
-Libgloss-specific @file{multi-build.in} file.  That is used by a few ports to
-further produce multiple targets.
+combined toolchain source tree.
 
 @node GCC, Libraries, Libgloss, Top
 @chapter Porting GCC
diff --git a/libgloss/multi-build.in b/libgloss/multi-build.in
deleted file mode 100644
index 80919ed6f8a7..000000000000
--- a/libgloss/multi-build.in
+++ /dev/null
@@ -1,66 +0,0 @@
-# This is like ../multilib.am and ../config-ml.in and ../config/multi.m4 mashed
-# into one file.  It relies on some custom hardcoded MULTI* variables in the
-# respective Makefile.in instead of dynamic compiler probing that ../multilib.am
-# does.
-
-PWD_COMMAND=$${PWDCMD-pwd}
-
-# FIXME: There should be an @-sign in front of the `if'.
-# Leave out until this is tested a bit more.
-libgloss-multi-do:
-	if [ -z "$(MULTIDIRS)" ]; then \
-	  true; \
-	else \
-	  rootpre=`${PWD_COMMAND}`/; export rootpre; \
-	  srcrootpre=`cd $(srcdir); ${PWD_COMMAND}`/; export srcrootpre; \
-	  lib=`echo "$${rootpre}" | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; export lib; \
-	  compiler="$(CC)"; \
-	  for dir in $(MULTIDIRS); do \
-	    if [ "$${dir}" = "." ]; then \
-	      true; \
-	    else \
-	      destpre=`echo $${rootpre}/$${dir}`/; export destpre; \
-	      if ! test -d $${destpre} ; then \
-		mkdir -p $${destpre}; \
-		cd $${destpre}; \
-		config_cmd=`../config.status --config | sed -re "s:--srcdir=([^/]):--srcdir=../\1:"`; \
-		$(SHELL) -c "$(SHELL) $${srcrootpre}/configure $${config_cmd}";\
-		sed -e "s:^MULTIDIRS[[:space:]]*+=.*$$:MULTIDIRS = :" \
-		    -e "s:^MULTILIBNAME[[:space:]]*=.*$$:MULTILIBNAME = MULTIDIR_$${dir}_NAME:" \
-		    -e "s:^MULTI_FLAGS_FOR_TARGET[[:space:]]*=.*$$:MULTI_FLAGS_FOR_TARGET = MULTIDIR_$${dir}_FLAGS:" \
-		    -e "s:^objdir[[:space:]]*=.*$$:objdir = ..:" \
-			Makefile > Makefile.tem; \
-		rm -f Makefile; \
-		mv Makefile.tem Makefile; \
-	      else \
-		cd $${destpre}; \
-	      fi; \
-	      if ($(MAKE) $(FLAGS_TO_PASS) \
-		    CFLAGS="$(CFLAGS)" \
-		    CCASFLAGS="$(CCASFLAGS)" \
-		    FCFLAGS="$(FCFLAGS)" \
-		    FFLAGS="$(FFLAGS)" \
-		    ADAFLAGS="$(ADAFLAGS)" \
-		    prefix="$(prefix)" \
-		    exec_prefix="$(exec_prefix)" \
-		    GCJFLAGS="$(GCJFLAGS)" \
-		    GOCFLAGS="$(GOCFLAGS)" \
-		    CXXFLAGS="$(CXXFLAGS)" \
-		    LIBCFLAGS="$(LIBCFLAGS)" \
-		    LIBCXXFLAGS="$(LIBCXXFLAGS)" \
-		    LDFLAGS="$(LDFLAGS)" \
-		    MULTIFLAGS="" \
-		    DESTDIR="$(DESTDIR)" \
-		    SOURCE="${srcdir}/" \
-		    INSTALL="$(INSTALL)" \
-		    INSTALL_DATA="$(INSTALL_DATA)" \
-		    INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \
-		    INSTALL_SCRIPT="$(INSTALL_SCRIPT)" \
-		    $(DO)); then \
-		cd $${rootpre}; \
-	      else \
-		exit 1; \
-	      fi; \
-	    fi; \
-	  done; \
-	fi
-- 
2.38.1



More information about the Newlib mailing list