From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 965A6385840A; Sat, 30 Dec 2023 02:08:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 965A6385840A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1703902129; bh=PhwF5nYMfaeUn2pkyNOC+CeW82tIOhfTaPvIkVNOuug=; h=From:To:Subject:Date:From; b=Z0SPNIIK7J8QIQPEPePeil6SKbtbtfskjZUyOrebXwubyA73EDb0pBSPc1jApHQxQ eri1LxHStSKsPgV9vUzuQs0Fk8D1PhwsuYgciFHxJf/AQxqdf+8R5HV14W3UQDhTPT olkVG9YBMHf2W/arOBq16Q3PwCVKzuCGKJyTK4/8= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: newlib-cvs@sourceware.org Subject: [newlib-cygwin/main] libgloss: sparc: add missing m4 include X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/main X-Git-Oldrev: 98230b7db1bab77e5fce817ed8c81dd7c577372c X-Git-Newrev: a84860f4882c4d3c743c66a4861b5213799e6405 Message-Id: <20231230020849.965A6385840A@sourceware.org> Date: Sat, 30 Dec 2023 02:08:49 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Da84860f4882= c4d3c743c66a4861b5213799e6405 commit a84860f4882c4d3c743c66a4861b5213799e6405 Author: Mike Frysinger Date: Fri Dec 29 00:33:05 2023 -0500 libgloss: sparc: add missing m4 include =20 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 =3D $(top_srcdir)/../config/depstan= d.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 =3D $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -253,7 +254,8 @@ CONFIG_CLEAN_FILES =3D 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 =3D am__vpath_adj_setup =3D srcdirstrip=3D`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj =3D case $$p in \ @@ -822,6 +824,8 @@ PATH_SEPARATOR =3D @PATH_SEPARATOR@ RANLIB =3D @RANLIB@ SET_MAKE =3D @SET_MAKE@ SHELL =3D @SHELL@ +SPARC_CPU =3D @SPARC_CPU@ +SPARC_CYGMONLDSCRIPTTEMPL =3D @SPARC_CYGMONLDSCRIPTTEMPL@ STRIP =3D @STRIP@ VERSION =3D @VERSION@ XTENSA_BOARD_ESP =3D @XTENSA_BOARD_ESP@ @@ -1345,6 +1349,8 @@ or1k/Makefile: $(top_builddir)/config.status $(top_sr= cdir)/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/l= ibsys/Makefile.in + cd $(top_builddir) && $(SHELL) ./config.status $@ install-multilibtoolLIBRARIES: $(multilibtool_LIBRARIES) @$(NORMAL_INSTALL) @list=3D'$(multilibtool_LIBRARIES)'; test -n "$(multilibtooldir)" || list= =3D; \ 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 =20 =20 =20 +SPARC_CPU=3DSPARC +case ${target_cpu} in +sparclite*) SPARC_CPU=3DSLITE ;; +sparclet*) SPARC_CPU=3DSPLET ;; +sparc64*) SPARC_CPU=3DSPARC64 ;; +sparc86x*) SPARC_CPU=3DSLITE ;; +esac + + +SPARC_CYGMONLDSCRIPTTEMPL=3Dcygmon.ld.src +case ${target_cpu} in +sparc64*) SPARC_CYGMONLDSCRIPTTEMPL=3Dcygmon-sparc64-ld.src ;; +sparclet-*-aout*) SPARC_CYGMONLDSCRIPTTEMPL=3Dcygmon.ld.src; ac_config_fil= es=3D"$ac_config_files sparc/libsys/Makefile" + ;; +esac + + XTENSA_BOARD_ESP=3D`echo $CC | sed 's/.*-mdynconfig=3Dxtensa_\(.*\)\.so.*/= \1/;s/.*-mcpu=3D\(^ *\).*/\1/;s/.* .*/unknown/'` =20 if test x$XTENSA_BOARD_ESP =3D xesp32; then @@ -6069,6 +6088,7 @@ do "or1k/Makefile") CONFIG_FILES=3D"$CONFIG_FILES or1k/Makefile" ;; "pru/Makefile") CONFIG_FILES=3D"$CONFIG_FILES pru/Makefile" ;; "depfiles") CONFIG_COMMANDS=3D"$CONFIG_COMMANDS depfiles" ;; + "sparc/libsys/Makefile") CONFIG_FILES=3D"$CONFIG_FILES sparc/libsys/Ma= kefile" ;; "default-1") CONFIG_COMMANDS=3D"$CONFIG_COMMANDS default-1" ;; "default-2") CONFIG_COMMANDS=3D"$CONFIG_COMMANDS default-2" ;; "Makefile") CONFIG_FILES=3D"$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]) =20 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)/../deb= ug.h $(srcdir)/../debug.c erc32-stub.o: $(srcdir)/erc32-stub.c $(srcdir)/../debug.h $(srcdir)/../deb= ug.c fixctors.o : $(srcdir)/fixctors.c =20 -$(objdir)/cygmon.ld: @SPARC_CYGMONLDSCRIPTTEMPL@ +$(objdir)/cygmon.ld: $(srcdir)/@SPARC_CYGMONLDSCRIPTTEMPL@ sed 's/TARGET_OBJ_FORMAT/$($(CPU)_OBJ_FORMAT)/g;s/TARGET_RAM_START/$($(CP= U)_RAM_START)/g;' < $(<) > $(objdir)/cygmon.ld =20 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=3DSLITE ;; esac AC_SUBST(SPARC_CPU) =20 -SPARC_CYGMONLDSCRIPTTEMPL=3D${srcdir}/sparc/cygmon.ld.src +SPARC_CYGMONLDSCRIPTTEMPL=3Dcygmon.ld.src case ${target_cpu} in -sparc64*) SPARC_CYGMONLDSCRIPTTEMPL=3D${srcdir}/sparc/cygmon-sparc64-ld.sr= c ;; -sparclet-*-aout*) SPARC_CYGMONLDSCRIPTTEMPL=3D${srcdir}/sparc/cygmon.ld.sr= c; AC_CONFIG_FILES([sparc/libsys/Makefile]) ;; +sparc64*) SPARC_CYGMONLDSCRIPTTEMPL=3Dcygmon-sparc64-ld.src ;; +sparclet-*-aout*) SPARC_CYGMONLDSCRIPTTEMPL=3Dcygmon.ld.src; AC_CONFIG_FIL= ES([sparc/libsys/Makefile]) ;; esac AC_SUBST(SPARC_CYGMONLDSCRIPTTEMPL)