libgloss: merge sparc configure script up a level

Move the minor sparc-specific logic to a dedicated variable so we can merge its configure logic up a level.
dscho · Feb 24, 2022 · 8d75828 · 8d75828
1 parent 2f2b915
commit 8d75828
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 4,407 deletions.
diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in
@@ -164,14 +164,15 @@ CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = arc/Makefile csky/Makefile epiphany/Makefile \
 	i386/Makefile m32r/Makefile m68hc11/Makefile nds32/Makefile \
 	m68k/Makefile pa/Makefile i960/Makefile sparc_leon/Makefile \
-	mips/Makefile riscv/Makefile rs6000/Makefile mn10200/Makefile \
-	mn10300/Makefile cr16/Makefile cris/Makefile crx/Makefile \
-	d30v/Makefile fr30/Makefile frv/Makefile ft32/Makefile \
-	lm32/Makefile mcore/Makefile mep/Makefile moxie/Makefile \
-	microblaze/Makefile mt/Makefile v850/Makefile visium/Makefile \
-	xc16x/Makefile xstormy16/Makefile m32c/Makefile \
-	msp430/Makefile rl78/Makefile rx/Makefile spu/Makefile \
-	tic6x/Makefile or1k/Makefile pru/Makefile nios2/Makefile
+	sparc/Makefile mips/Makefile riscv/Makefile rs6000/Makefile \
+	mn10200/Makefile mn10300/Makefile cr16/Makefile cris/Makefile \
+	crx/Makefile d30v/Makefile fr30/Makefile frv/Makefile \
+	ft32/Makefile lm32/Makefile mcore/Makefile mep/Makefile \
+	moxie/Makefile microblaze/Makefile mt/Makefile v850/Makefile \
+	visium/Makefile xc16x/Makefile xstormy16/Makefile \
+	m32c/Makefile msp430/Makefile rl78/Makefile rx/Makefile \
+	spu/Makefile tic6x/Makefile or1k/Makefile pru/Makefile \
+	nios2/Makefile
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -719,6 +720,8 @@ i960/Makefile: $(top_builddir)/config.status $(top_srcdir)/i960/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 sparc_leon/Makefile: $(top_builddir)/config.status $(top_srcdir)/sparc_leon/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+sparc/Makefile: $(top_builddir)/config.status $(top_srcdir)/sparc/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 mips/Makefile: $(top_builddir)/config.status $(top_srcdir)/mips/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 riscv/Makefile: $(top_builddir)/config.status $(top_srcdir)/riscv/Makefile.in

diff --git a/libgloss/configure b/libgloss/configure
@@ -743,7 +743,6 @@ CCAS
 CCASFLAGS
 CPP'
 ac_subdirs_all='aarch64
-sparc
 arm'
 
 # Initialize some variables set by options.
@@ -2774,8 +2773,9 @@ subdirs="$subdirs aarch64"
 	subdirs="$subdirs sparc_leon"
 	;;
   sparclet-*-aout* | sparc-*-elf* | sparc64-*-elf* | sparc86x-*-* | sparclite-*-*)
-	subdirs="$subdirs sparc"
+	ac_config_files="$ac_config_files sparc/Makefile"
 
+	subdirs="$subdirs sparc"
 	;;
   sh*-*-pe | mips*-*-pe | *arm*-wince-pe)
 	config_wince=true
@@ -6054,6 +6054,7 @@ do
     "pa/Makefile") CONFIG_FILES="$CONFIG_FILES pa/Makefile" ;;
     "i960/Makefile") CONFIG_FILES="$CONFIG_FILES i960/Makefile" ;;
     "sparc_leon/Makefile") CONFIG_FILES="$CONFIG_FILES sparc_leon/Makefile" ;;
+    "sparc/Makefile") CONFIG_FILES="$CONFIG_FILES sparc/Makefile" ;;
     "mips/Makefile") CONFIG_FILES="$CONFIG_FILES mips/Makefile" ;;
     "riscv/Makefile") CONFIG_FILES="$CONFIG_FILES riscv/Makefile" ;;
     "rs6000/Makefile") CONFIG_FILES="$CONFIG_FILES rs6000/Makefile" ;;

diff --git a/libgloss/configure.ac b/libgloss/configure.ac
@@ -85,7 +85,8 @@ case "${target}" in
 	subdirs="$subdirs sparc_leon"
 	;;
   sparclet-*-aout* | sparc-*-elf* | sparc64-*-elf* | sparc86x-*-* | sparclite-*-*)
-	AC_CONFIG_SUBDIRS([sparc])
+	AC_CONFIG_FILES([sparc/Makefile])
+	subdirs="$subdirs sparc"
 	;;
   sh*-*-pe | mips*-*-pe | *arm*-wince-pe)
 	config_wince=true

diff --git a/libgloss/sparc/Makefile.in b/libgloss/sparc/Makefile.in
@@ -93,7 +93,7 @@ OBJS = close.o fstat.o getpid.o isatty.o kill.o \
 # variants (via runtime switches).  However, the compiler [currently] doesn't.
 # Of course, it may be the case that there isn't any cpu specific code in
 # C source files, but there might be in the future.
-CPU = @CPU@
+CPU = @SPARC_CPU@
 
 # sparc stuff (not sparclite or sparclet)
 SPARC_ALL = $(CYGMON_BSP) $(CYGMON_CRT0) $(objdir)/cygmon.ld
@@ -170,7 +170,7 @@ sparcl-stub.o: $(srcdir)/sparcl-stub.c $(srcdir)/../debug.h $(srcdir)/../debug.c
 erc32-stub.o: $(srcdir)/erc32-stub.c $(srcdir)/../debug.h $(srcdir)/../debug.c
 fixctors.o : $(srcdir)/fixctors.c
 
-$(objdir)/cygmon.ld: @CYGMONLDSCRIPTTEMPL@
+$(objdir)/cygmon.ld: @SPARC_CYGMONLDSCRIPTTEMPL@
 	sed 's/TARGET_OBJ_FORMAT/$($(CPU)_OBJ_FORMAT)/g;s/TARGET_RAM_START/$($(CPU)_RAM_START)/g;' < $(<) > $(objdir)/cygmon.ld
 
 install: $($(CPU)_INSTALL)
@@ -278,16 +278,12 @@ clean mostlyclean:
 	rm -f *.o *.a *.map *.x
 
 distclean maintainer-clean realclean: clean
-	rm -f Makefile config.cache config.log config.status
+	rm -f Makefile
 
 .PHONY: info dvi doc install-info clean-info
 info doc dvi:
 install-info:
 clean-info:
 
-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/sparc/acinclude.m4 b/libgloss/sparc/acinclude.m4
@@ -0,0 +1,15 @@
+SPARC_CPU=SPARC
+case ${target_cpu} in
+sparclite*) SPARC_CPU=SLITE ;;
+sparclet*) SPARC_CPU=SPLET ;;
+sparc64*) SPARC_CPU=SPARC64 ;;
+sparc86x*) SPARC_CPU=SLITE ;;
+esac
+AC_SUBST(SPARC_CPU)
+
+SPARC_CYGMONLDSCRIPTTEMPL=${srcdir}/sparc/cygmon.ld.src
+case ${target_cpu} in
+sparc64*) SPARC_CYGMONLDSCRIPTTEMPL=${srcdir}/sparc/cygmon-sparc64-ld.src ;;
+sparclet-*-aout*) SPARC_CYGMONLDSCRIPTTEMPL=${srcdir}/sparc/cygmon.ld.src; AC_CONFIG_FILES([sparc/libsys/Makefile]) ;;
+esac
+AC_SUBST(SPARC_CYGMONLDSCRIPTTEMPL)