From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id CB257385B535; Thu, 12 Jan 2023 01:47:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CB257385B535 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673488031; bh=8U9mvDQR/WS4wYyAX+7DXd0q945DiqX2EeWh5oo1ZtY=; h=From:To:Subject:Date:From; b=R26G0IYhKIw0kZYDImsfveVgsrPd7Y3IxIMkumoudvlt7nc7evtyGwnlheoWnanUI MPE30wd/JC1VfJOaFE3KivX5FeAW8QZRaczIx2PuxaTfUJDy7BBl0spJUGkQDCckbf XXtwLf7PO+f/P1qaTfT6ZBzfOCM12ID8JhlXxCoQ= 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] libgloss: merge d30v into top-level Makefile X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 5401db924f565a72939d2b7cb66d6d51203fefb7 X-Git-Newrev: 0e1c0a02cfeafaeb88be025c6e99538337d67d8c Message-Id: <20230112014711.CB257385B535@sourceware.org> Date: Thu, 12 Jan 2023 01:47:11 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D0e1c0a02cfe= afaeb88be025c6e99538337d67d8c commit 0e1c0a02cfeafaeb88be025c6e99538337d67d8c Author: Mike Frysinger Date: Wed Dec 14 18:58:01 2022 -0500 libgloss: merge d30v into top-level Makefile =20 Avoid a recursive make to speed things up a bit. Diff: --- libgloss/Makefile.am | 3 ++ libgloss/Makefile.in | 112 ++++++++++++++++++++++++++++----------- libgloss/configure | 19 +++++-- libgloss/configure.ac | 5 +- libgloss/d30v/Makefile.in | 129 -----------------------------------------= ---- libgloss/d30v/Makefile.inc | 12 +++++ 6 files changed, 112 insertions(+), 168 deletions(-) diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am index b6b89cf4f..13290453c 100644 --- a/libgloss/Makefile.am +++ b/libgloss/Makefile.am @@ -75,6 +75,9 @@ endif if CONFIG_BFIN include bfin/Makefile.inc endif +if CONFIG_D30V +include d30v/Makefile.inc +endif if CONFIG_IQ2000 include iq2000/Makefile.inc endif diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in index bd7dd3740..a17685107 100644 --- a/libgloss/Makefile.in +++ b/libgloss/Makefile.in @@ -156,25 +156,29 @@ check_PROGRAMS =3D $(am__EXEEXT_2) $(am__EXEEXT_3) =20 @CONFIG_BFIN_TRUE@@HAVE_MULTISUBDIR_FALSE@am__append_16 =3D $(wildcard $(s= rcdir)/bfin/include/*.h) @CONFIG_BFIN_TRUE@@HAVE_MULTISUBDIR_FALSE@am__append_17 =3D $(wildcard $(s= rcdir)/bfin/include/sys/*.h) -@CONFIG_IQ2000_TRUE@am__append_18 =3D iq2000/crt0.o iq2000/sim.ld -@CONFIG_IQ2000_TRUE@am__append_19 =3D iq2000/libeval.a -@CONFIG_IQ2000_TRUE@am__append_20 =3D iq2000/crt0.S iq2000/test.o -@CONFIG_IQ2000_TRUE@am__append_21 =3D iq2000/test -@CONFIG_LIBNOSYS_TRUE@am__append_22 =3D libnosys/nosys.specs -@CONFIG_LIBNOSYS_TRUE@am__append_23 =3D libnosys/libnosys.a -@CONFIG_LM32_TRUE@am__append_24 =3D lm32/crt0.o lm32/sim.ld -@CONFIG_LM32_TRUE@am__append_25 =3D lm32/libgloss.a -@CONFIG_LM32_TRUE@am__append_26 =3D lm32/crt0.S -@CONFIG_RISCV_TRUE@am__append_27 =3D \ +@CONFIG_D30V_TRUE@am__append_18 =3D d30v/libsim.a +@CONFIG_D30V_TRUE@am__append_19 =3D \ +@CONFIG_D30V_TRUE@ d30v/crt0.o + +@CONFIG_IQ2000_TRUE@am__append_20 =3D iq2000/crt0.o iq2000/sim.ld +@CONFIG_IQ2000_TRUE@am__append_21 =3D iq2000/libeval.a +@CONFIG_IQ2000_TRUE@am__append_22 =3D iq2000/crt0.S iq2000/test.o +@CONFIG_IQ2000_TRUE@am__append_23 =3D iq2000/test +@CONFIG_LIBNOSYS_TRUE@am__append_24 =3D libnosys/nosys.specs +@CONFIG_LIBNOSYS_TRUE@am__append_25 =3D libnosys/libnosys.a +@CONFIG_LM32_TRUE@am__append_26 =3D lm32/crt0.o lm32/sim.ld +@CONFIG_LM32_TRUE@am__append_27 =3D lm32/libgloss.a +@CONFIG_LM32_TRUE@am__append_28 =3D lm32/crt0.S +@CONFIG_RISCV_TRUE@am__append_29 =3D \ @CONFIG_RISCV_TRUE@ riscv/nano.specs \ @CONFIG_RISCV_TRUE@ riscv/sim.specs \ @CONFIG_RISCV_TRUE@ riscv/semihost.specs \ @CONFIG_RISCV_TRUE@ riscv/crt0.o =20 -@CONFIG_RISCV_TRUE@am__append_28 =3D riscv/libgloss.a \ +@CONFIG_RISCV_TRUE@am__append_30 =3D riscv/libgloss.a \ @CONFIG_RISCV_TRUE@ riscv/libsemihost.a -@CONFIG_WINCE_TRUE@am__append_29 =3D $(gdbdir) -@CONFIG_WINCE_TRUE@am__append_30 =3D wince/stub.exe +@CONFIG_WINCE_TRUE@am__append_31 =3D $(gdbdir) +@CONFIG_WINCE_TRUE@am__append_32 =3D wince/stub.exe subdir =3D . ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps =3D $(top_srcdir)/../config/depstand.m4 \ @@ -202,9 +206,9 @@ CONFIG_CLEAN_FILES =3D csky/Makefile epiphany/Makefile = i386/Makefile \ pa/Makefile i960/Makefile sparc_leon/Makefile sparc/Makefile \ mips/Makefile rs6000/Makefile mn10200/Makefile \ mn10300/Makefile cr16/Makefile cris/Makefile crx/Makefile \ - d30v/Makefile fr30/Makefile frv/Makefile ft32/Makefile \ - mcore/Makefile mep/Makefile moxie/Makefile microblaze/Makefile \ - mt/Makefile v850/Makefile visium/Makefile xc16x/Makefile \ + fr30/Makefile frv/Makefile ft32/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 @@ -312,6 +316,14 @@ bfin_libsim_a_LIBADD =3D @CONFIG_BFIN_TRUE@am_bfin_libsim_a_OBJECTS =3D bfin/bfin_libsim_a-clear_ca= che_range.$(OBJEXT) \ @CONFIG_BFIN_TRUE@ bfin/bfin_libsim_a-syscalls.$(OBJEXT) bfin_libsim_a_OBJECTS =3D $(am_bfin_libsim_a_OBJECTS) +d30v_libsim_a_AR =3D $(AR) $(ARFLAGS) +d30v_libsim_a_LIBADD =3D +@CONFIG_D30V_TRUE@am_d30v_libsim_a_OBJECTS =3D isatty.$(OBJEXT) \ +@CONFIG_D30V_TRUE@ print.$(OBJEXT) putnum.$(OBJEXT) \ +@CONFIG_D30V_TRUE@ sbrk.$(OBJEXT) d30v/inbyte.$(OBJEXT) \ +@CONFIG_D30V_TRUE@ d30v/outbyte.$(OBJEXT) \ +@CONFIG_D30V_TRUE@ d30v/syscalls.$(OBJEXT) +d30v_libsim_a_OBJECTS =3D $(am_d30v_libsim_a_OBJECTS) iq2000_libeval_a_AR =3D $(AR) $(ARFLAGS) iq2000_libeval_a_LIBADD =3D @CONFIG_IQ2000_TRUE@am_iq2000_libeval_a_OBJECTS =3D \ @@ -498,10 +510,11 @@ SOURCES =3D $(aarch64_librdimon_a_SOURCES) $(arc_libn= sim_a_SOURCES) \ $(arm_libgloss_linux_a_SOURCES) $(arm_librdimon_v2m_a_SOURCES) \ $(arm_librdimon_a_SOURCES) $(arm_librdpmon_a_SOURCES) \ $(bfin_libbfinbsp_a_SOURCES) $(bfin_libsim_a_SOURCES) \ - $(iq2000_libeval_a_SOURCES) $(libnosys_libnosys_a_SOURCES) \ - $(libobjs_a_SOURCES) $(lm32_libgloss_a_SOURCES) \ - $(riscv_libgloss_a_SOURCES) $(riscv_libsemihost_a_SOURCES) \ - bfin/sim-test.c iq2000/test.c $(wince_stub_exe_SOURCES) + $(d30v_libsim_a_SOURCES) $(iq2000_libeval_a_SOURCES) \ + $(libnosys_libnosys_a_SOURCES) $(libobjs_a_SOURCES) \ + $(lm32_libgloss_a_SOURCES) $(riscv_libgloss_a_SOURCES) \ + $(riscv_libsemihost_a_SOURCES) bfin/sim-test.c iq2000/test.c \ + $(wince_stub_exe_SOURCES) AM_V_DVIPS =3D $(am__v_DVIPS_@AM_V@) am__v_DVIPS_ =3D $(am__v_DVIPS_@AM_DEFAULT_V@) am__v_DVIPS_0 =3D @echo " DVIPS " $@; @@ -588,7 +601,7 @@ ETAGS =3D etags CTAGS =3D ctags CSCOPE =3D cscope DIST_SUBDIRS =3D $(SUBDIRS) -VPATH =3D @srcdir@ $(am__append_29) +VPATH =3D @srcdir@ $(am__append_31) AARCH64_OBJTYPE =3D @AARCH64_OBJTYPE@ ACLOCAL =3D @ACLOCAL@ AMTAR =3D @AMTAR@ @@ -722,11 +735,12 @@ tooldir =3D $(exec_prefix)/$(target_alias) multilibtooldir =3D $(tooldir)/lib$(MULTISUBDIR) multilibtool_DATA =3D $(am__append_3) $(am__append_6) $(am__append_7) \ $(am__append_8) $(am__append_13) $(am__append_15) \ - $(am__append_18) $(am__append_22) $(am__append_24) \ - $(am__append_27) + $(am__append_19) $(am__append_20) $(am__append_24) \ + $(am__append_26) $(am__append_29) multilibtool_LIBRARIES =3D $(am__append_2) $(am__append_5) \ - $(am__append_9) $(am__append_11) $(am__append_19) \ - $(am__append_23) $(am__append_25) $(am__append_28) + $(am__append_9) $(am__append_11) $(am__append_18) \ + $(am__append_21) $(am__append_25) $(am__append_27) \ + $(am__append_30) includetooldir =3D $(tooldir)/include includetool_DATA =3D $(am__append_16) includesystooldir =3D $(tooldir)/include/sys @@ -736,7 +750,7 @@ AM_CPPFLAGS =3D -idirafter $(srcroot)/include # A fake library so automake will generate rules for plain objects that we= want # to install (e.g. our crt0.o objects). noinst_LIBRARIES =3D libobjs.a -libobjs_a_SOURCES =3D $(am__append_14) $(am__append_20) $(am__append_26) +libobjs_a_SOURCES =3D $(am__append_14) $(am__append_22) $(am__append_28) FLAGS_TO_PASS =3D \ "CC=3D$(CC)" \ "CFLAGS=3D$(CFLAGS)" \ @@ -846,6 +860,15 @@ TEXINFO_TEX =3D ../texinfo/texinfo.tex @CONFIG_BFIN_TRUE@ $(AM_CPPFLAGS) \ @CONFIG_BFIN_TRUE@ $(bfin_CPPFLAGS) =20 +@CONFIG_D30V_TRUE@d30v_libsim_a_SOURCES =3D \ +@CONFIG_D30V_TRUE@ isatty.c \ +@CONFIG_D30V_TRUE@ print.c \ +@CONFIG_D30V_TRUE@ putnum.c \ +@CONFIG_D30V_TRUE@ sbrk.c \ +@CONFIG_D30V_TRUE@ d30v/inbyte.c \ +@CONFIG_D30V_TRUE@ d30v/outbyte.c \ +@CONFIG_D30V_TRUE@ d30v/syscalls.c + @CONFIG_IQ2000_TRUE@iq2000_libeval_a_SOURCES =3D \ @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 iq200= 0/isatty.c \ @@ -959,7 +982,7 @@ all: config.h .SUFFIXES: .S .c .dvi .o .obj .ps am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_= srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/aarch64/Makefil= e.inc $(srcdir)/aarch64/cpu-init/Makefile.inc $(srcdir)/arc/Makefile.inc $(= srcdir)/arm/Makefile.inc $(srcdir)/arm/cpu-init/Makefile.inc $(srcdir)/bfin= /Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc= $(srcdir)/lm32/Makefile.inc $(srcdir)/riscv/Makefile.inc $(srcdir)/wince/M= akefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_= srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/aarch64/Makefil= e.inc $(srcdir)/aarch64/cpu-init/Makefile.inc $(srcdir)/arc/Makefile.inc $(= srcdir)/arm/Makefile.inc $(srcdir)/arm/cpu-init/Makefile.inc $(srcdir)/bfin= /Makefile.inc $(srcdir)/d30v/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(s= rcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/riscv/Ma= kefile.inc $(srcdir)/wince/Makefile.inc $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -981,7 +1004,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config= .status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfil= es_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_mayb= e);; \ esac; -$(top_srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/aarch64/= Makefile.inc $(srcdir)/aarch64/cpu-init/Makefile.inc $(srcdir)/arc/Makefile= .inc $(srcdir)/arm/Makefile.inc $(srcdir)/arm/cpu-init/Makefile.inc $(srcdi= r)/bfin/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makef= ile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/riscv/Makefile.inc $(srcdir)/= wince/Makefile.inc $(am__empty): +$(top_srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/aarch64/= Makefile.inc $(srcdir)/aarch64/cpu-init/Makefile.inc $(srcdir)/arc/Makefile= .inc $(srcdir)/arm/Makefile.inc $(srcdir)/arm/cpu-init/Makefile.inc $(srcdi= r)/bfin/Makefile.inc $(srcdir)/d30v/Makefile.inc $(srcdir)/iq2000/Makefile.= inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/r= iscv/Makefile.inc $(srcdir)/wince/Makefile.inc $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) $(SHELL) ./config.status --recheck @@ -1042,8 +1065,6 @@ cris/Makefile: $(top_builddir)/config.status $(top_sr= cdir)/cris/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ crx/Makefile: $(top_builddir)/config.status $(top_srcdir)/crx/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ -d30v/Makefile: $(top_builddir)/config.status $(top_srcdir)/d30v/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ fr30/Makefile: $(top_builddir)/config.status $(top_srcdir)/fr30/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ frv/Makefile: $(top_builddir)/config.status $(top_srcdir)/frv/Makefile.in @@ -1254,6 +1275,23 @@ bfin/libsim.a: $(bfin_libsim_a_OBJECTS) $(bfin_libsi= m_a_DEPENDENCIES) $(EXTRA_bf $(AM_V_at)-rm -f bfin/libsim.a $(AM_V_AR)$(bfin_libsim_a_AR) bfin/libsim.a $(bfin_libsim_a_OBJECTS) $(bf= in_libsim_a_LIBADD) $(AM_V_at)$(RANLIB) bfin/libsim.a +d30v/$(am__dirstamp): + @$(MKDIR_P) d30v + @: > d30v/$(am__dirstamp) +d30v/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) d30v/$(DEPDIR) + @: > d30v/$(DEPDIR)/$(am__dirstamp) +d30v/inbyte.$(OBJEXT): d30v/$(am__dirstamp) \ + d30v/$(DEPDIR)/$(am__dirstamp) +d30v/outbyte.$(OBJEXT): d30v/$(am__dirstamp) \ + d30v/$(DEPDIR)/$(am__dirstamp) +d30v/syscalls.$(OBJEXT): d30v/$(am__dirstamp) \ + d30v/$(DEPDIR)/$(am__dirstamp) + +d30v/libsim.a: $(d30v_libsim_a_OBJECTS) $(d30v_libsim_a_DEPENDENCIES) $(EX= TRA_d30v_libsim_a_DEPENDENCIES) d30v/$(am__dirstamp) + $(AM_V_at)-rm -f d30v/libsim.a + $(AM_V_AR)$(d30v_libsim_a_AR) d30v/libsim.a $(d30v_libsim_a_OBJECTS) $(d3= 0v_libsim_a_LIBADD) + $(AM_V_at)$(RANLIB) d30v/libsim.a iq2000/$(am__dirstamp): @$(MKDIR_P) iq2000 @: > iq2000/$(am__dirstamp) @@ -1595,6 +1633,7 @@ mostlyclean-compile: -rm -f arc/*.$(OBJEXT) -rm -f arm/*.$(OBJEXT) -rm -f bfin/*.$(OBJEXT) + -rm -f d30v/*.$(OBJEXT) -rm -f iq2000/*.$(OBJEXT) -rm -f libnosys/*.$(OBJEXT) -rm -f lm32/*.$(OBJEXT) @@ -1603,6 +1642,10 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c =20 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isatty.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/putnum.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sbrk.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wince_stub_exe-wince-stub= .Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@aarch64/$(DEPDIR)/aarch64_librdimon_a= -_exit.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@aarch64/$(DEPDIR)/aarch64_librdimon_a= -_kill.Po@am__quote@ @@ -1644,6 +1687,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@bfin/$(DEPDIR)/bfin_libsim_a-syscalls= .Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@bfin/$(DEPDIR)/crt0.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@bfin/$(DEPDIR)/sim-test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@d30v/$(DEPDIR)/inbyte.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@d30v/$(DEPDIR)/outbyte.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@d30v/$(DEPDIR)/syscalls.Po@am__quote@ @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@ @@ -3362,6 +3408,8 @@ distclean-generic: -rm -f arm/$(am__dirstamp) -rm -f bfin/$(DEPDIR)/$(am__dirstamp) -rm -f bfin/$(am__dirstamp) + -rm -f d30v/$(DEPDIR)/$(am__dirstamp) + -rm -f d30v/$(am__dirstamp) -rm -f doc/$(am__dirstamp) -rm -f iq2000/$(DEPDIR)/$(am__dirstamp) -rm -f iq2000/$(am__dirstamp) @@ -3384,7 +3432,7 @@ clean-am: clean-aminfo clean-binPROGRAMS clean-checkP= ROGRAMS \ =20 distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(= DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) riscv/$(DEPDIR) + -rm -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(= DEPDIR) d30v/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) r= iscv/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-local distclean-tags @@ -3527,7 +3575,7 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(= DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) riscv/$(DEPDIR) + -rm -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(= DEPDIR) d30v/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) r= iscv/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-aminfo \ maintainer-clean-generic maintainer-clean-local diff --git a/libgloss/configure b/libgloss/configure index 449346817..84d4c5e43 100755 --- a/libgloss/configure +++ b/libgloss/configure @@ -640,6 +640,8 @@ CONFIG_LIBNOSYS_FALSE CONFIG_LIBNOSYS_TRUE CONFIG_IQ2000_FALSE CONFIG_IQ2000_TRUE +CONFIG_D30V_FALSE +CONFIG_D30V_TRUE CONFIG_BFIN_FALSE CONFIG_BFIN_TRUE CONFIG_ARM_FALSE @@ -2855,9 +2857,7 @@ case "${target}" in subdirs=3D"$subdirs crx" ;; d30v-*-*) - ac_config_files=3D"$ac_config_files d30v/Makefile" - - subdirs=3D"$subdirs d30v" + config_d30v=3Dtrue ;; fr30-*-*) ac_config_files=3D"$ac_config_files fr30/Makefile" @@ -3015,6 +3015,14 @@ else CONFIG_BFIN_FALSE=3D fi =20 + if test x$config_d30v =3D xtrue; then + CONFIG_D30V_TRUE=3D + CONFIG_D30V_FALSE=3D'#' +else + CONFIG_D30V_TRUE=3D'#' + CONFIG_D30V_FALSE=3D +fi + if test x$config_iq2000 =3D xtrue; then CONFIG_IQ2000_TRUE=3D CONFIG_IQ2000_FALSE=3D'#' @@ -5291,6 +5299,10 @@ if test -z "${CONFIG_BFIN_TRUE}" && test -z "${CONFI= G_BFIN_FALSE}"; then as_fn_error $? "conditional \"CONFIG_BFIN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${CONFIG_D30V_TRUE}" && test -z "${CONFIG_D30V_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_D30V\" 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}"; th= en as_fn_error $? "conditional \"CONFIG_IQ2000\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -5949,7 +5961,6 @@ do "cr16/Makefile") CONFIG_FILES=3D"$CONFIG_FILES cr16/Makefile" ;; "cris/Makefile") CONFIG_FILES=3D"$CONFIG_FILES cris/Makefile" ;; "crx/Makefile") CONFIG_FILES=3D"$CONFIG_FILES crx/Makefile" ;; - "d30v/Makefile") CONFIG_FILES=3D"$CONFIG_FILES d30v/Makefile" ;; "fr30/Makefile") CONFIG_FILES=3D"$CONFIG_FILES fr30/Makefile" ;; "frv/Makefile") CONFIG_FILES=3D"$CONFIG_FILES frv/Makefile" ;; "ft32/Makefile") CONFIG_FILES=3D"$CONFIG_FILES ft32/Makefile" ;; diff --git a/libgloss/configure.ac b/libgloss/configure.ac index ef7b57854..59230edc9 100644 --- a/libgloss/configure.ac +++ b/libgloss/configure.ac @@ -141,8 +141,7 @@ case "${target}" in subdirs=3D"$subdirs crx" ;; d30v-*-*) - AC_CONFIG_FILES([d30v/Makefile]) - subdirs=3D"$subdirs d30v" + config_d30v=3Dtrue ;; fr30-*-*) AC_CONFIG_FILES([fr30/Makefile]) @@ -250,7 +249,7 @@ AC_SUBST(subdirs) dnl These subdirs have converted to non-recursive make. Hopefully someday= all dnl the ports above will too! m4_foreach_w([SUBDIR], [ - aarch64 arc arm bfin iq2000 libnosys lm32 riscv wince + aarch64 arc arm bfin d30v iq2000 libnosys lm32 riscv wince ], [dnl AM_CONDITIONAL([CONFIG_]m4_toupper(SUBDIR), [test x$config_]SUBDIR =3D x= true) ]) diff --git a/libgloss/d30v/Makefile.in b/libgloss/d30v/Makefile.in deleted file mode 100644 index a27e720ff..000000000 --- a/libgloss/d30v/Makefile.in +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright (c) 1997 Cygnus Support -# -# 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. -# - -# -# This currently works with the D30V simulator. -# - -DESTDIR =3D -VPATH =3D @srcdir@ @srcdir@/.. -srcdir =3D @srcdir@ -objdir =3D . -srcroot =3D $(srcdir)/../.. -objroot =3D $(objdir)/../.. - -prefix =3D @prefix@ -exec_prefix =3D @exec_prefix@ - -host_alias =3D @host_alias@ -target_alias =3D @target_alias@ - -bindir =3D @bindir@ -libdir =3D @libdir@ -tooldir =3D $(exec_prefix)/$(target_alias) - -# Multilib support variables. -# TOP is used instead of MULTI{BUILD,SRC}TOP. -MULTIDIRS =3D -MULTISUBDIR =3D -MULTIDO =3D true -MULTICLEAN =3D true - -INSTALL =3D @INSTALL@ -INSTALL_PROGRAM =3D @INSTALL_PROGRAM@ -INSTALL_DATA =3D @INSTALL_DATA@ - -SHELL =3D /bin/sh - -mkinstalldirs =3D $(SHELL) $(srcroot)/mkinstalldirs - -CC =3D @CC@ - -AS =3D @AS@ -AR =3D @AR@ -LD =3D @LD@ -RANLIB =3D @RANLIB@ - -OBJDUMP =3D `if [ -f ${objroot}/../binutils/objdump ] ; \ - then echo ${objroot}/../binutils/objdump ; \ - else t=3D'$(program_transform_name)'; echo objdump | sed -e $$t ; fi` -OBJCOPY =3D `if [ -f ${objroot}/../binutils/objcopy ] ; \ - then echo ${objroot}/../binutils/objcopy ; \ - else t=3D'$(program_transform_name)'; echo objcopy | sed -e $$t ; fi` - -OBJS =3D isatty.o print.o putnum.o sbrk.o -CFLAGS =3D -g -SCRIPTS =3D ${SIM_SCRIPTS} - -# Here is all of the simulator stuff -SIM_SCRIPTS =3D -SIM_LDFLAGS =3D -SIM_BSP =3D libsim.a -SIM_CRT0 =3D crt0.o -SIM_OBJS =3D syscalls.o outbyte.o inbyte.o -SIM_TEST =3D -SIM_INSTALL =3D install-sim - -# 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: ${SIM_CRT0} ${SIM_BSP} - -# -# here's where we build the board support packages for each target -# - -${SIM_BSP}: ${OBJS} ${SIM_OBJS} - ${AR} ${ARFLAGS} $@ ${SIM_OBJS} ${OBJS} - ${RANLIB} $@ - -# -# here's where we build the test programs for each target -# -.PHONY: test -test: ${SIM_TEST} - -crt0.o: crt0.S -syscalls.o: syscalls.c $(srcdir)/../syscall.h -outbyte.o: outbyte.c -inbyte.o: inbyte.c - -isatty.o: $(srcdir)/../isatty.c -print.o: $(srcdir)/../print.c -putnum.o: $(srcdir)/../putnum.c -sbrk.o: $(srcdir)/../sbrk.c - -clean mostlyclean: - rm -f a.out core *.[oais] *-test *.srec *.dis *.x syscall.h - -distclean maintainer-clean realclean: clean - rm -f Makefile *~ - -.PHONY: install info install-info clean-info -install: ${SIM_INSTALL} - -install-sim: - ${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR} - set -e; for x in ${SIM_CRT0} ${SIM_BSP} ${SIM_SCRIPTS}; do ${INSTALL_DATA= } $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done - -doc: -info: -install-info: -clean-info: - -Makefile: Makefile.in ../config.status - cd .. && $(SHELL) config.status diff --git a/libgloss/d30v/Makefile.inc b/libgloss/d30v/Makefile.inc new file mode 100644 index 000000000..2b12739d7 --- /dev/null +++ b/libgloss/d30v/Makefile.inc @@ -0,0 +1,12 @@ +multilibtool_LIBRARIES +=3D %D%/libsim.a +%C%_libsim_a_SOURCES =3D \ + isatty.c \ + print.c \ + putnum.c \ + sbrk.c \ + %D%/inbyte.c \ + %D%/outbyte.c \ + %D%/syscalls.c + +multilibtool_DATA +=3D \ + %D%/crt0.o