diff options
author | Mike Frysinger <vapier@gentoo.org> | 2022-02-02 00:23:50 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2022-02-11 06:14:55 -0500 |
commit | 62e580f01b8d1c5a3bce5c046853332217cf6458 (patch) | |
tree | f0943e4d0701a87e46bebba931bc991466f5f2d0 | |
parent | f8aede785505de293feb0c105450a0f32e8cbfe6 (diff) | |
download | newlib-62e580f01b8d1c5a3bce5c046853332217cf6458.zip newlib-62e580f01b8d1c5a3bce5c046853332217cf6458.tar.gz newlib-62e580f01b8d1c5a3bce5c046853332217cf6458.tar.bz2 |
libgloss: merge iq2000 into top-level Makefile
Avoid a recursive make to speed things up a bit.
-rw-r--r-- | libgloss/Makefile.am | 3 | ||||
-rw-r--r-- | libgloss/Makefile.in | 181 | ||||
-rw-r--r-- | libgloss/aclocal.m4 | 20 | ||||
-rwxr-xr-x | libgloss/configure | 189 | ||||
-rw-r--r-- | libgloss/configure.ac | 7 | ||||
-rw-r--r-- | libgloss/iq2000/Makefile.in | 149 | ||||
-rw-r--r-- | libgloss/iq2000/Makefile.inc | 11 |
7 files changed, 368 insertions, 192 deletions
diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am index 1209ec9..42d7b7f 100644 --- a/libgloss/Makefile.am +++ b/libgloss/Makefile.am @@ -53,6 +53,9 @@ TEXINFO_TEX = ../texinfo/texinfo.tex if HAVE_DOC include doc/Makefile.inc endif +if CONFIG_IQ2000 +include iq2000/Makefile.inc +endif if CONFIG_LIBNOSYS include libnosys/Makefile.inc endif diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in index 97ec942..4226cff 100644 --- a/libgloss/Makefile.in +++ b/libgloss/Makefile.in @@ -90,10 +90,14 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -check_PROGRAMS = +check_PROGRAMS = $(am__EXEEXT_1) @HAVE_DOC_TRUE@am__append_1 = doc/porting.texi -@CONFIG_LIBNOSYS_TRUE@am__append_2 = libnosys/nosys.specs -@CONFIG_LIBNOSYS_TRUE@am__append_3 = libnosys/libnosys.a +@CONFIG_IQ2000_TRUE@am__append_2 = iq2000/crt0.o iq2000/sim.ld +@CONFIG_IQ2000_TRUE@am__append_3 = iq2000/libeval.a +@CONFIG_IQ2000_TRUE@am__append_4 = iq2000/crt0.S iq2000/test.o +@CONFIG_IQ2000_TRUE@am__append_5 = iq2000/test +@CONFIG_LIBNOSYS_TRUE@am__append_6 = libnosys/nosys.specs +@CONFIG_LIBNOSYS_TRUE@am__append_7 = libnosys/libnosys.a subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ @@ -117,8 +121,8 @@ CONFIG_CLEAN_FILES = arc/Makefile epiphany/Makefile m32r/Makefile \ lm32/Makefile mep/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 iq2000/Makefile \ - or1k/Makefile pru/Makefile nios2/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 \ @@ -155,9 +159,33 @@ AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) am__v_AR_0 = @echo " AR " $@; am__v_AR_1 = +iq2000_libeval_a_AR = $(AR) $(ARFLAGS) +iq2000_libeval_a_LIBADD = +am__dirstamp = $(am__leading_dot)dirstamp +@CONFIG_IQ2000_TRUE@am_iq2000_libeval_a_OBJECTS = \ +@CONFIG_IQ2000_TRUE@ iq2000/_exit.$(OBJEXT) \ +@CONFIG_IQ2000_TRUE@ iq2000/access.$(OBJEXT) \ +@CONFIG_IQ2000_TRUE@ iq2000/chmod.$(OBJEXT) \ +@CONFIG_IQ2000_TRUE@ iq2000/close.$(OBJEXT) \ +@CONFIG_IQ2000_TRUE@ iq2000/crt1.$(OBJEXT) \ +@CONFIG_IQ2000_TRUE@ iq2000/fstat.$(OBJEXT) \ +@CONFIG_IQ2000_TRUE@ iq2000/getpid.$(OBJEXT) \ +@CONFIG_IQ2000_TRUE@ iq2000/gettime.$(OBJEXT) \ +@CONFIG_IQ2000_TRUE@ iq2000/isatty.$(OBJEXT) \ +@CONFIG_IQ2000_TRUE@ iq2000/kill.$(OBJEXT) \ +@CONFIG_IQ2000_TRUE@ iq2000/lseek.$(OBJEXT) \ +@CONFIG_IQ2000_TRUE@ iq2000/open.$(OBJEXT) \ +@CONFIG_IQ2000_TRUE@ iq2000/read.$(OBJEXT) \ +@CONFIG_IQ2000_TRUE@ iq2000/sbrk.$(OBJEXT) \ +@CONFIG_IQ2000_TRUE@ iq2000/stat.$(OBJEXT) \ +@CONFIG_IQ2000_TRUE@ iq2000/time.$(OBJEXT) \ +@CONFIG_IQ2000_TRUE@ iq2000/trap.$(OBJEXT) \ +@CONFIG_IQ2000_TRUE@ iq2000/unlink.$(OBJEXT) \ +@CONFIG_IQ2000_TRUE@ iq2000/utime.$(OBJEXT) \ +@CONFIG_IQ2000_TRUE@ iq2000/write.$(OBJEXT) +iq2000_libeval_a_OBJECTS = $(am_iq2000_libeval_a_OBJECTS) libnosys_libnosys_a_AR = $(AR) $(ARFLAGS) libnosys_libnosys_a_LIBADD = -am__dirstamp = $(am__leading_dot)dirstamp @CONFIG_LIBNOSYS_TRUE@am_libnosys_libnosys_a_OBJECTS = \ @CONFIG_LIBNOSYS_TRUE@ libnosys/chown.$(OBJEXT) \ @CONFIG_LIBNOSYS_TRUE@ libnosys/close.$(OBJEXT) \ @@ -186,8 +214,13 @@ am__dirstamp = $(am__leading_dot)dirstamp libnosys_libnosys_a_OBJECTS = $(am_libnosys_libnosys_a_OBJECTS) libobjs_a_AR = $(AR) $(ARFLAGS) libobjs_a_LIBADD = -am_libobjs_a_OBJECTS = +@CONFIG_IQ2000_TRUE@am__objects_1 = iq2000/crt0.$(OBJEXT) +am_libobjs_a_OBJECTS = $(am__objects_1) libobjs_a_OBJECTS = $(am_libobjs_a_OBJECTS) +@CONFIG_IQ2000_TRUE@am__EXEEXT_1 = iq2000/test$(EXEEXT) +iq2000_test_SOURCES = iq2000/test.c +iq2000_test_OBJECTS = iq2000/test.$(OBJEXT) +iq2000_test_LDADD = $(LDADD) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -204,6 +237,12 @@ DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/../depcomp am__depfiles_maybe = depfiles am__mv = mv -f +CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) +AM_V_CPPAS = $(am__v_CPPAS_@AM_V@) +am__v_CPPAS_ = $(am__v_CPPAS_@AM_DEFAULT_V@) +am__v_CPPAS_0 = @echo " CPPAS " $@; +am__v_CPPAS_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) @@ -216,7 +255,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(libnosys_libnosys_a_SOURCES) $(libobjs_a_SOURCES) +SOURCES = $(iq2000_libeval_a_SOURCES) $(libnosys_libnosys_a_SOURCES) \ + $(libobjs_a_SOURCES) iq2000/test.c AM_V_DVIPS = $(am__v_DVIPS_@AM_V@) am__v_DVIPS_ = $(am__v_DVIPS_@AM_DEFAULT_V@) am__v_DVIPS_0 = @echo " DVIPS " $@; @@ -312,6 +352,7 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ CCAS = @CCAS@ +CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -414,13 +455,13 @@ PHONY = SUBDIRS = @subdirs@ . tooldir = $(exec_prefix)/$(target_alias) multilibtooldir = $(tooldir)/lib$(MULTISUBDIR) -multilibtool_DATA = $(am__append_2) -multilibtool_LIBRARIES = $(am__append_3) +multilibtool_DATA = $(am__append_2) $(am__append_6) +multilibtool_LIBRARIES = $(am__append_3) $(am__append_7) # A fake library so automake will generate rules for plain objects that we want # to install (e.g. our crt0.o objects). noinst_LIBRARIES = libobjs.a -libobjs_a_SOURCES = +libobjs_a_SOURCES = $(am__append_4) FLAGS_TO_PASS = \ "CC=$(CC)" \ "CFLAGS=$(CFLAGS)" \ @@ -452,6 +493,12 @@ MULTISUBDIR = MULTIDO = true MULTICLEAN = true TEXINFO_TEX = ../texinfo/texinfo.tex +@CONFIG_IQ2000_TRUE@iq2000_libeval_a_SOURCES = \ +@CONFIG_IQ2000_TRUE@ iq2000/_exit.c iq2000/access.c iq2000/chmod.c iq2000/close.c iq2000/crt1.c \ +@CONFIG_IQ2000_TRUE@ iq2000/fstat.c iq2000/getpid.c iq2000/gettime.c iq2000/isatty.c \ +@CONFIG_IQ2000_TRUE@ iq2000/kill.c iq2000/lseek.c iq2000/open.c iq2000/read.c \ +@CONFIG_IQ2000_TRUE@ iq2000/sbrk.c iq2000/stat.c iq2000/time.c iq2000/trap.c iq2000/unlink.c iq2000/utime.c iq2000/write.c + @CONFIG_LIBNOSYS_TRUE@libnosys_libnosys_a_SOURCES = \ @CONFIG_LIBNOSYS_TRUE@ libnosys/chown.c \ @CONFIG_LIBNOSYS_TRUE@ libnosys/close.c \ @@ -482,10 +529,10 @@ all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -.SUFFIXES: .c .dvi .o .obj .ps +.SUFFIXES: .S .c .dvi .o .obj .ps am--refresh: Makefile @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -507,7 +554,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(am__empty): +$(top_srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -596,8 +643,6 @@ spu/Makefile: $(top_builddir)/config.status $(top_srcdir)/spu/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ tic6x/Makefile: $(top_builddir)/config.status $(top_srcdir)/tic6x/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ -iq2000/Makefile: $(top_builddir)/config.status $(top_srcdir)/iq2000/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ 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 @@ -638,6 +683,57 @@ clean-multilibtoolLIBRARIES: clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) +iq2000/$(am__dirstamp): + @$(MKDIR_P) iq2000 + @: > iq2000/$(am__dirstamp) +iq2000/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) iq2000/$(DEPDIR) + @: > iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/_exit.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/access.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/chmod.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/close.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/crt1.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/fstat.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/getpid.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/gettime.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/isatty.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/kill.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/lseek.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/open.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/read.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/sbrk.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/stat.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/time.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/trap.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/unlink.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/utime.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) +iq2000/write.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) + +iq2000/libeval.a: $(iq2000_libeval_a_OBJECTS) $(iq2000_libeval_a_DEPENDENCIES) $(EXTRA_iq2000_libeval_a_DEPENDENCIES) iq2000/$(am__dirstamp) + $(AM_V_at)-rm -f iq2000/libeval.a + $(AM_V_AR)$(iq2000_libeval_a_AR) iq2000/libeval.a $(iq2000_libeval_a_OBJECTS) $(iq2000_libeval_a_LIBADD) + $(AM_V_at)$(RANLIB) iq2000/libeval.a libnosys/$(am__dirstamp): @$(MKDIR_P) libnosys @: > libnosys/$(am__dirstamp) @@ -697,6 +793,8 @@ libnosys/libnosys.a: $(libnosys_libnosys_a_OBJECTS) $(libnosys_libnosys_a_DEPEND $(AM_V_at)-rm -f libnosys/libnosys.a $(AM_V_AR)$(libnosys_libnosys_a_AR) libnosys/libnosys.a $(libnosys_libnosys_a_OBJECTS) $(libnosys_libnosys_a_LIBADD) $(AM_V_at)$(RANLIB) libnosys/libnosys.a +iq2000/crt0.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) libobjs.a: $(libobjs_a_OBJECTS) $(libobjs_a_DEPENDENCIES) $(EXTRA_libobjs_a_DEPENDENCIES) $(AM_V_at)-rm -f libobjs.a @@ -705,14 +803,43 @@ libobjs.a: $(libobjs_a_OBJECTS) $(libobjs_a_DEPENDENCIES) $(EXTRA_libobjs_a_DEPE clean-checkPROGRAMS: -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) +iq2000/test.$(OBJEXT): iq2000/$(am__dirstamp) \ + iq2000/$(DEPDIR)/$(am__dirstamp) + +iq2000/test$(EXEEXT): $(iq2000_test_OBJECTS) $(iq2000_test_DEPENDENCIES) $(EXTRA_iq2000_test_DEPENDENCIES) iq2000/$(am__dirstamp) + @rm -f iq2000/test$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(iq2000_test_OBJECTS) $(iq2000_test_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) + -rm -f iq2000/*.$(OBJEXT) -rm -f libnosys/*.$(OBJEXT) distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/_exit.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/access.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/chmod.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/close.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/crt0.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/crt1.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/fstat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/getpid.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/gettime.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/isatty.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/kill.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/lseek.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/open.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/read.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/sbrk.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/stat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/time.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/trap.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/unlink.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/utime.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@iq2000/$(DEPDIR)/write.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnosys/$(DEPDIR)/_exit.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnosys/$(DEPDIR)/chown.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnosys/$(DEPDIR)/close.Po@am__quote@ @@ -738,6 +865,22 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@libnosys/$(DEPDIR)/wait.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnosys/$(DEPDIR)/write.Po@am__quote@ +.S.o: +@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCCAS_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ $< + +.S.obj: +@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCCAS_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @@ -1056,6 +1199,8 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) -rm -f doc/$(am__dirstamp) + -rm -f iq2000/$(DEPDIR)/$(am__dirstamp) + -rm -f iq2000/$(am__dirstamp) -rm -f libnosys/$(DEPDIR)/$(am__dirstamp) -rm -f libnosys/$(am__dirstamp) @@ -1070,7 +1215,7 @@ clean-am: clean-aminfo clean-checkPROGRAMS clean-generic clean-local \ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf libnosys/$(DEPDIR) + -rm -rf iq2000/$(DEPDIR) libnosys/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-local distclean-tags @@ -1210,7 +1355,7 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf libnosys/$(DEPDIR) + -rm -rf iq2000/$(DEPDIR) libnosys/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-aminfo \ maintainer-clean-generic maintainer-clean-local diff --git a/libgloss/aclocal.m4 b/libgloss/aclocal.m4 index 6f7b7f7..a74c735 100644 --- a/libgloss/aclocal.m4 +++ b/libgloss/aclocal.m4 @@ -56,6 +56,26 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +# Figure out how to run the assembler. -*- Autoconf -*- + +# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_AS +# ---------- +AC_DEFUN([AM_PROG_AS], +[# By default we simply use the C compiler to build assembly code. +AC_REQUIRE([AC_PROG_CC]) +test "${CCAS+set}" = set || CCAS=$CC +test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS +AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)]) +AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)]) +_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl +]) + # AM_AUX_DIR_EXPAND -*- Autoconf -*- # Copyright (C) 2001-2017 Free Software Foundation, Inc. diff --git a/libgloss/configure b/libgloss/configure index 5cc6dc1..f648899 100755 --- a/libgloss/configure +++ b/libgloss/configure @@ -591,14 +591,17 @@ multi_basedir target_makefile_frag_path host_makefile_frag_path CPP +am__fastdepCCAS_FALSE +am__fastdepCCAS_TRUE +CCASDEPMODE +CCASFLAGS +CCAS OBJEXT EXEEXT ac_ct_CC CPPFLAGS LDFLAGS CFLAGS -CCASFLAGS -CCAS RANLIB LD AR @@ -616,6 +619,8 @@ DEPDIR CC CONFIG_LIBNOSYS_FALSE CONFIG_LIBNOSYS_TRUE +CONFIG_IQ2000_FALSE +CONFIG_IQ2000_TRUE subdirs HAVE_DOC_FALSE HAVE_DOC_TRUE @@ -707,13 +712,13 @@ enable_multilib ac_precious_vars='build_alias host_alias target_alias -CCAS -CCASFLAGS CC CFLAGS LDFLAGS LIBS CPPFLAGS +CCAS +CCASFLAGS CPP' ac_subdirs_all='aarch64 csky @@ -1354,8 +1359,6 @@ Optional Features: --enable-multilib build many library versions (default) Some influential environment variables: - CCAS assembler compiler command (defaults to CC) - CCASFLAGS assembler compiler flags (defaults to CFLAGS) CC C compiler command CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a @@ -1363,6 +1366,8 @@ Some influential environment variables: LIBS libraries to pass to the linker, e.g. -l<library> CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> + CCAS assembler compiler command (defaults to CC) + CCASFLAGS assembler compiler flags (defaults to CFLAGS) CPP C preprocessor Use these variables to override the choices made by `configure' or to help @@ -2879,9 +2884,7 @@ subdirs="$subdirs aarch64" config_testsuite=false ;; iq2000-*-*) - ac_config_files="$ac_config_files iq2000/Makefile" - - subdirs="$subdirs iq2000" + config_iq2000=true ;; or1k-*-* | or1knd-*-* ) ac_config_files="$ac_config_files or1k/Makefile" @@ -2900,6 +2903,15 @@ subdirs="$subdirs aarch64" ;; esac + if test x$config_iq2000 = xtrue; then + CONFIG_IQ2000_TRUE= + CONFIG_IQ2000_FALSE='#' +else + CONFIG_IQ2000_TRUE='#' + CONFIG_IQ2000_FALSE= +fi + + if test x$config_libnosys = xtrue; then CONFIG_LIBNOSYS_TRUE= @@ -3454,18 +3466,6 @@ else RANLIB="$ac_cv_prog_RANLIB" fi -# By default we simply use the C compiler to build assembly code. - -test "${CCAS+set}" = set || CCAS=$CC -test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS - - - - - -$as_echo "#define HAVE_GNU_LD 1" >>confdefs.h - - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4518,6 +4518,144 @@ else fi +# By default we simply use the C compiler to build assembly code. + +test "${CCAS+set}" = set || CCAS=$CC +test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS + + + +depcc="$CCAS" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CCAS_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CCAS_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CCAS_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CCAS_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } +CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then + am__fastdepCCAS_TRUE= + am__fastdepCCAS_FALSE='#' +else + am__fastdepCCAS_TRUE='#' + am__fastdepCCAS_FALSE= +fi + + + + +$as_echo "#define HAVE_GNU_LD 1" >>confdefs.h + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5021,6 +5159,10 @@ if test -z "${HAVE_DOC_TRUE}" && test -z "${HAVE_DOC_FALSE}"; then as_fn_error $? "conditional \"HAVE_DOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${CONFIG_IQ2000_TRUE}" && test -z "${CONFIG_IQ2000_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_IQ2000\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${CONFIG_LIBNOSYS_TRUE}" && test -z "${CONFIG_LIBNOSYS_FALSE}"; then as_fn_error $? "conditional \"CONFIG_LIBNOSYS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -5037,6 +5179,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -5677,7 +5823,6 @@ do "rx/Makefile") CONFIG_FILES="$CONFIG_FILES rx/Makefile" ;; "spu/Makefile") CONFIG_FILES="$CONFIG_FILES spu/Makefile" ;; "tic6x/Makefile") CONFIG_FILES="$CONFIG_FILES tic6x/Makefile" ;; - "iq2000/Makefile") CONFIG_FILES="$CONFIG_FILES iq2000/Makefile" ;; "or1k/Makefile") CONFIG_FILES="$CONFIG_FILES or1k/Makefile" ;; "pru/Makefile") CONFIG_FILES="$CONFIG_FILES pru/Makefile" ;; "nios2/Makefile") CONFIG_FILES="$CONFIG_FILES nios2/Makefile" ;; diff --git a/libgloss/configure.ac b/libgloss/configure.ac index f411ff0..8f6019a 100644 --- a/libgloss/configure.ac +++ b/libgloss/configure.ac @@ -208,8 +208,7 @@ case "${target}" in config_testsuite=false ;; iq2000-*-*) - AC_CONFIG_FILES([iq2000/Makefile]) - subdirs="$subdirs iq2000" + config_iq2000=true ;; or1k-*-* | or1knd-*-* ) AC_CONFIG_FILES([or1k/Makefile]) @@ -225,6 +224,8 @@ case "${target}" in ;; esac +AM_CONDITIONAL(CONFIG_IQ2000, test x$config_iq2000 = xtrue) + dnl For now, don't bother configuring testsuite dnl dnl if test "${config_testsuite}" = "true"; @@ -242,7 +243,7 @@ AC_SUBST(AR) LD=${LD-ld} AC_SUBST(LD) AC_PROG_RANLIB -LIB_AM_PROG_AS +AM_PROG_AS AC_DEFINE(HAVE_GNU_LD, 1, [Using GNU LD]) diff --git a/libgloss/iq2000/Makefile.in b/libgloss/iq2000/Makefile.in deleted file mode 100644 index 4555a74..0000000 --- a/libgloss/iq2000/Makefile.in +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright (c) 2000, Cygnus Solutions, A Red Hat Company -# -# 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. - -DESTDIR = -VPATH = @srcdir@ -srcdir = @srcdir@ -objdir = . -srcroot = $(srcdir)/../.. -objroot = $(objdir)/../.. - -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -host_alias = @host_alias@ -target_alias = @target_alias@ -program_transform_name = @program_transform_name@ - -bindir = @bindir@ -libdir = @libdir@ -tooldir = $(exec_prefix)/$(target_alias) - -# Multilib support variables. -# TOP is used instead of MULTI{BUILD,SRC}TOP. -MULTIDIRS = -MULTISUBDIR = -MULTIDO = true -MULTICLEAN = true - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ - -SHELL = /bin/sh - -mkinstalldirs = $(SHELL) $(srcroot)/mkinstalldirs - -CC = @CC@ - -#AS = @AS@ -AS = `if [ -f ${objroot}/../gas/as.new ] ; \ - then echo ${objroot}/../gas/as.new ; \ - else echo as ; fi` - -AR = @AR@ - -#LD = @LD@ -LD = `if [ -f ${objroot}/../ld/ld.new ] ; \ - then echo ${objroot}/../ld/ld.new ; \ - else echo ld ; fi` - -RANLIB = @RANLIB@ - -OBJDUMP = `if [ -f ${objroot}/../binutils/objdump ] ; \ - then echo ${objroot}/../binutils/objdump ; \ - else t='$(program_transform_name)'; echo objdump | sed -e $$t ; fi` -OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \ - then echo ${objroot}/../binutils/objcopy ; \ - else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi` - -CRT0 = crt0.o - -# Generic object files common to all targets. -GENOBJS = _exit.o access.o chmod.o close.o crt1.o \ - fstat.o getpid.o gettime.o isatty.o \ - kill.o lseek.o open.o read.o \ - sbrk.o stat.o time.o trap.o unlink.o utime.o write.o - -# Object files specific to particular targets. -EVALOBJS = ${GENOBJS} - -CFLAGS = -g - -GCC_LDFLAGS = `if [ -d ${objroot}/../gcc ] ; \ - then echo -L${objroot}/../gcc ; fi` - -SCRIPTS = sim -BSP = libeval.a - -# Host specific makefile fragment comes in here. -@host_makefile_frag@ - -# -# build a test program for each target board. Just trying to get -# it to link is a good test, so we ignore all the errors for now. -# - -all: ${CRT0} test.o ${BSP} - -# -# here's where we build the board support packages for each target -# - -libeval.a: $(EVALOBJS) - ${AR} ${ARFLAGS} $@ $(EVALOBJS) - ${RANLIB} $@ - - -# compile a fully linked binary. The -Wl,-T*.ld is for the linker -# script. By using -Wl, the linker script is put on the proper place -# in the comand line for ld, and all the symbols will get fully -# resolved. - -test: $(CRT0) test.o - ${CC} $(CFLAGS_FOR_TARGET) -L${srcdir} -L${objdir} \ - test.o -o $@ $(NEWLIB_LDFLAGS) - @echo Done... - -doc: - -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 - -.PHONY: install info install-info clean-info -install: - ${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR} - $(INSTALL_PROGRAM) $(CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(CRT0) - @for bsp in ${BSP}; do\ - $(INSTALL_PROGRAM) $${bsp} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}; \ - done - @for script in ${SCRIPTS}; do\ - $(INSTALL_DATA) $(srcdir)/$${script}.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$${script}.ld; \ - done - -info: -install-info: -clean-info: - -test.o: ${srcdir}/test.c - -# these are for the BSPs -${CRT0}: ${srcdir}/crt0.S - -# target specific makefile fragment comes in here. -@target_makefile_frag@ - -Makefile: Makefile.in ../config.status - cd .. && $(SHELL) config.status diff --git a/libgloss/iq2000/Makefile.inc b/libgloss/iq2000/Makefile.inc new file mode 100644 index 0000000..97c9142 --- /dev/null +++ b/libgloss/iq2000/Makefile.inc @@ -0,0 +1,11 @@ +multilibtool_DATA += %D%/crt0.o %D%/sim.ld +multilibtool_LIBRARIES += %D%/libeval.a +libobjs_a_SOURCES += %D%/crt0.S %D%/test.o + +%C%_libeval_a_SOURCES = \ + %D%/_exit.c %D%/access.c %D%/chmod.c %D%/close.c %D%/crt1.c \ + %D%/fstat.c %D%/getpid.c %D%/gettime.c %D%/isatty.c \ + %D%/kill.c %D%/lseek.c %D%/open.c %D%/read.c \ + %D%/sbrk.c %D%/stat.c %D%/time.c %D%/trap.c %D%/unlink.c %D%/utime.c %D%/write.c + +check_PROGRAMS += %D%/test |