libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

libgloss: sparc: add missing m4 include 

Commit 8d75828378 ("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.
This commit is contained in:
Mike Frysinger 2023-12-29 00:33:05 -05:00
parent 98230b7db1
commit a84860f488
5 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libgloss/Makefile.in
View File

@ -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=; \

20
libgloss/configure vendored
View File

@ -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" ;;

1
libgloss/configure.ac
View File

@ -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

2
libgloss/sparc/Makefile.in
View File

@ -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)

6
libgloss/sparc/acinclude.m4
View File

@ -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)