[PATCH 7/8] libgloss: merge mn10200 configure script up a level

Mike Frysinger vapier@gentoo.org
Fri Feb 11 12:50:53 GMT 2022


The mn10200-specific logic (setting up part_specific_obj) isn't used
by the build anywhere -- looks like copy & paste left overs from mips.
So punt that & merge the target_makefile_frag_path up to the top-level.
---
 libgloss/Makefile.in          |   18 +-
 libgloss/configure            |    6 +-
 libgloss/configure.ac         |    4 +-
 libgloss/mn10200/Makefile.in  |    9 +-
 libgloss/mn10200/aclocal.m4   |  384 ----
 libgloss/mn10200/configure    | 3940 ---------------------------------
 libgloss/mn10200/configure.ac |   58 -
 7 files changed, 20 insertions(+), 4399 deletions(-)
 delete mode 100644 libgloss/mn10200/aclocal.m4
 delete mode 100755 libgloss/mn10200/configure
 delete mode 100644 libgloss/mn10200/configure.ac

diff --git a/libgloss/configure.ac b/libgloss/configure.ac
index a32deae08bf4..f2e0d442e8d3 100644
--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -102,7 +102,9 @@ case "${target}" in
 	host_makefile_frag=${srcdir}/config/ppc.mh
 	;;
   mn10200-*-*)
-	AC_CONFIG_SUBDIRS([mn10200])
+	AC_CONFIG_FILES([mn10200/Makefile])
+	subdirs="$subdirs mn10200"
+	target_makefile_frag=${srcdir}/config/mn10200.mt
 	;;
   mn10300-*-*)
 	AC_CONFIG_SUBDIRS([mn10300])
diff --git a/libgloss/mn10200/Makefile.in b/libgloss/mn10200/Makefile.in
index af16e7a52977..9db24f444771 100644
--- a/libgloss/mn10200/Makefile.in
+++ b/libgloss/mn10200/Makefile.in
@@ -120,7 +120,7 @@ clean mostlyclean:
 	rm -f a.out core *.i *~ *.o *-test *.srec *.dis *.map *.x
 
 distclean maintainer-clean realclean: clean
-	rm -f Makefile config.status a.out
+	rm -f Makefile a.out
 
 .PHONY: install info install-info clean-info
 install:
@@ -145,8 +145,5 @@ ${CRT0}: ${srcdir}/crt0.S
 # target specific makefile fragment comes in here.
 @target_makefile_frag@
 
-Makefile: Makefile.in config.status @host_makefile_frag_path@ @target_makefile_frag_path@
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
+Makefile: Makefile.in ../config.status
+	cd .. && $(SHELL) config.status
diff --git a/libgloss/mn10200/configure.ac b/libgloss/mn10200/configure.ac
deleted file mode 100644
index d5a0cc87aac6..000000000000
--- a/libgloss/mn10200/configure.ac
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (c) 1995, 1996, 1997, 1998 Cygnus Support
-#
-# The authors hereby grant permission to use, copy, modify, distribute,
-# and license this software and its documentation for any purpose, provided
-# that existing copyright notices are retained in all copies and that this
-# notice is included verbatim in any distributions. No written agreement,
-# license, or royalty fee is required for any of the authorized uses.
-# Modifications to this software may be copyrighted by their authors
-# and need not follow the licensing terms described here, provided that
-# the new terms are clearly indicated on the first page of each file where
-# they apply.
-#
-# Process this file with autoconf to produce a configure script.
-#
-AC_INIT(crt0.S)
-
-AC_CONFIG_AUX_DIR(../..)
-
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-
-AC_PROG_INSTALL
-
-LIB_AC_PROG_CC
-AS=${AS-as}
-AC_SUBST(AS)
-AR=${AR-ar}
-AC_SUBST(AR)
-LD=${LD-ld}
-AC_SUBST(LD)
-AC_PROG_RANLIB
-LIB_AM_PROG_AS
-
-case "${target}" in
-  *)
-        part_specific_obj=vr4300.o
-        ;;
-esac
-
-host_makefile_frag=${srcdir}/../config/default.mh
-target_makefile_frag=${srcdir}/../config/mn10200.mt
-
-dnl We have to assign the same value to other variables because autoconf
-dnl doesn't provide a mechanism to substitute a replacement keyword with
-dnl arbitrary data or pathnames.
-dnl
-host_makefile_frag_path=$host_makefile_frag
-AC_SUBST(host_makefile_frag_path)
-AC_SUBST_FILE(host_makefile_frag)
-target_makefile_frag_path=$target_makefile_frag
-AC_SUBST(target_makefile_frag_path)
-AC_SUBST_FILE(target_makefile_frag)
-AC_SUBST(part_specific_obj)
-
-AM_ENABLE_MULTILIB(, ../..)
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-- 
2.34.1



More information about the Newlib mailing list