[newlib-cygwin/main] libgloss: sparc: add missing m4 include

[newlib-cygwin/main] libgloss: sparc: add missing m4 include

[Michael Frysinger]

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=a84860f4882c4d3c743c66a4861b5213799e6405

commit a84860f4882c4d3c743c66a4861b5213799e6405
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Fri Dec 29 00:33:05 2023 -0500

    libgloss: sparc: add missing m4 include
    
    Commit 8d758283785042589e95c93d7899cecf28ef00ea ("libgloss: merge
    sparc configure script up a level") missed including the sparc
    acinclude.m4 file which meant none of the sparc-specific vars were
    propagating to the sub-makefile.

Diff:
---
 libgloss/Makefile.in        |  8 +++++++-
 libgloss/configure          | 20 ++++++++++++++++++++
 libgloss/configure.ac       |  1 +
 libgloss/sparc/Makefile.in  |  2 +-
 libgloss/sparc/acinclude.m4 |  6 +++---
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in
index 429e48ac7..fd845cf5f 100644
--- a/libgloss/Makefile.in
+++ b/libgloss/Makefile.in
@@ -235,6 +235,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
 	$(top_srcdir)/mips/acinclude.m4 \
 	$(top_srcdir)/mn10300/acinclude.m4 \
 	$(top_srcdir)/moxie/acinclude.m4 \
+	$(top_srcdir)/sparc/acinclude.m4 \
 	$(top_srcdir)/xtensa/acinclude.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -253,7 +254,8 @@ CONFIG_CLEAN_FILES = epiphany/Makefile i386/Makefile m32r/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
+	spu/Makefile tic6x/Makefile or1k/Makefile pru/Makefile \
+	sparc/libsys/Makefile
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -822,6 +824,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SPARC_CPU = @SPARC_CPU@
+SPARC_CYGMONLDSCRIPTTEMPL = @SPARC_CYGMONLDSCRIPTTEMPL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 XTENSA_BOARD_ESP = @XTENSA_BOARD_ESP@
@@ -1345,6 +1349,8 @@ or1k/Makefile: $(top_builddir)/config.status $(top_srcdir)/or1k/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 pru/Makefile: $(top_builddir)/config.status $(top_srcdir)/pru/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+sparc/libsys/Makefile: $(top_builddir)/config.status $(top_srcdir)/sparc/libsys/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-multilibtoolLIBRARIES: $(multilibtool_LIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(multilibtool_LIBRARIES)'; test -n "$(multilibtooldir)" || list=; \
diff --git a/libgloss/configure b/libgloss/configure
index 28b45289e..5f6bc5841 100755
--- a/libgloss/configure
+++ b/libgloss/configure
@@ -596,6 +596,8 @@ HAVE_XTENSA_BOARD_ESP32S3_TRUE
 HAVE_XTENSA_BOARD_ESP32_FALSE
 HAVE_XTENSA_BOARD_ESP32_TRUE
 XTENSA_BOARD_ESP
+SPARC_CYGMONLDSCRIPTTEMPL
+SPARC_CPU
 MOXIE_BUILD_CRT0_FALSE
 MOXIE_BUILD_CRT0_TRUE
 MN10300_BSP_LIST
@@ -5108,6 +5110,23 @@ esac
 
 
 
+SPARC_CPU=SPARC
+case ${target_cpu} in
+sparclite*) SPARC_CPU=SLITE ;;
+sparclet*) SPARC_CPU=SPLET ;;
+sparc64*) SPARC_CPU=SPARC64 ;;
+sparc86x*) SPARC_CPU=SLITE ;;
+esac
+
+
+SPARC_CYGMONLDSCRIPTTEMPL=cygmon.ld.src
+case ${target_cpu} in
+sparc64*) SPARC_CYGMONLDSCRIPTTEMPL=cygmon-sparc64-ld.src ;;
+sparclet-*-aout*) SPARC_CYGMONLDSCRIPTTEMPL=cygmon.ld.src; ac_config_files="$ac_config_files sparc/libsys/Makefile"
+ ;;
+esac
+
+
 XTENSA_BOARD_ESP=`echo $CC | sed 's/.*-mdynconfig=xtensa_\(.*\)\.so.*/\1/;s/.*-mcpu=\(^ *\).*/\1/;s/.* .*/unknown/'`
 
  if test x$XTENSA_BOARD_ESP = xesp32; then
@@ -6069,6 +6088,7 @@ do
     "or1k/Makefile") CONFIG_FILES="$CONFIG_FILES or1k/Makefile" ;;
     "pru/Makefile") CONFIG_FILES="$CONFIG_FILES pru/Makefile" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "sparc/libsys/Makefile") CONFIG_FILES="$CONFIG_FILES sparc/libsys/Makefile" ;;
     "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
     "default-2") CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
diff --git a/libgloss/configure.ac b/libgloss/configure.ac
index 19bdf9b3a..268d86c51 100644
--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -351,6 +351,7 @@ m4_include([mcore/acinclude.m4])
 m4_include([mips/acinclude.m4])
 m4_include([mn10300/acinclude.m4])
 m4_include([moxie/acinclude.m4])
+m4_include([sparc/acinclude.m4])
 m4_include([xtensa/acinclude.m4])
 
 AC_CACHE_CHECK([for compiler search settings], libc_cv_compiler_isystem, [dnl
diff --git a/libgloss/sparc/Makefile.in b/libgloss/sparc/Makefile.in
index 4f22cf41c..c99d92a63 100644
--- a/libgloss/sparc/Makefile.in
+++ b/libgloss/sparc/Makefile.in
@@ -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: @SPARC_CYGMONLDSCRIPTTEMPL@
+$(objdir)/cygmon.ld: $(srcdir)/@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)
diff --git a/libgloss/sparc/acinclude.m4 b/libgloss/sparc/acinclude.m4
index bba852b9a..a58c7a559 100644
--- a/libgloss/sparc/acinclude.m4
+++ b/libgloss/sparc/acinclude.m4
@@ -7,9 +7,9 @@ sparc86x*) SPARC_CPU=SLITE ;;
 esac
 AC_SUBST(SPARC_CPU)
 
-SPARC_CYGMONLDSCRIPTTEMPL=${srcdir}/sparc/cygmon.ld.src
+SPARC_CYGMONLDSCRIPTTEMPL=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]) ;;
+sparc64*) SPARC_CYGMONLDSCRIPTTEMPL=cygmon-sparc64-ld.src ;;
+sparclet-*-aout*) SPARC_CYGMONLDSCRIPTTEMPL=cygmon.ld.src; AC_CONFIG_FILES([sparc/libsys/Makefile]) ;;
 esac
 AC_SUBST(SPARC_CYGMONLDSCRIPTTEMPL)