From 6bbeed74ca571b98af19dc7d52ce286f40c75229 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 26 Dec 2023 20:59:58 -0500 Subject: [PATCH] libgloss: merge i960 into top-level Makefile Avoid a recursive make to speed things up a bit. I can't test this as current versions of binutils doesn't support i960. --- libgloss/Makefile.am | 3 + libgloss/Makefile.in | 211 +++++++++++++++++++++++-------------- libgloss/configure | 19 +++- libgloss/configure.ac | 7 +- libgloss/i960/Makefile.in | 107 ------------------- libgloss/i960/Makefile.inc | 16 +++ 6 files changed, 168 insertions(+), 195 deletions(-) delete mode 100644 libgloss/i960/Makefile.in create mode 100644 libgloss/i960/Makefile.inc diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am index 742ef52c5..a8a445b1d 100644 --- a/libgloss/Makefile.am +++ b/libgloss/Makefile.am @@ -81,6 +81,9 @@ endif if CONFIG_D30V include d30v/Makefile.inc endif +if CONFIG_I960 +include i960/Makefile.inc +endif if CONFIG_IQ2000 include iq2000/Makefile.inc endif diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in index 59e9b2df7..ac2db2197 100644 --- a/libgloss/Makefile.in +++ b/libgloss/Makefile.in @@ -167,45 +167,50 @@ check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3) @CONFIG_D30V_TRUE@am__append_22 = \ @CONFIG_D30V_TRUE@ d30v/crt0.o -@CONFIG_IQ2000_TRUE@am__append_23 = iq2000/crt0.o iq2000/sim.ld -@CONFIG_IQ2000_TRUE@am__append_24 = iq2000/libeval.a -@CONFIG_IQ2000_TRUE@am__append_25 = iq2000/crt0.S iq2000/test.o -@CONFIG_IQ2000_TRUE@am__append_26 = iq2000/test -@CONFIG_LIBNOSYS_TRUE@am__append_27 = libnosys/nosys.specs -@CONFIG_LIBNOSYS_TRUE@am__append_28 = libnosys/libnosys.a -@CONFIG_LM32_TRUE@am__append_29 = lm32/crt0.o lm32/sim.ld -@CONFIG_LM32_TRUE@am__append_30 = lm32/libgloss.a -@CONFIG_LM32_TRUE@am__append_31 = lm32/crt0.S -@CONFIG_MOXIE_TRUE@@HAVE_MULTISUBDIR_FALSE@am__append_32 = \ +@CONFIG_I960_TRUE@am__append_23 = i960/crt0.o i960/mon960.ld +@CONFIG_I960_TRUE@am__append_24 = \ +@CONFIG_I960_TRUE@ i960/crt0.c + +@CONFIG_I960_TRUE@am__append_25 = i960/libmon960.a +@CONFIG_IQ2000_TRUE@am__append_26 = iq2000/crt0.o iq2000/sim.ld +@CONFIG_IQ2000_TRUE@am__append_27 = iq2000/libeval.a +@CONFIG_IQ2000_TRUE@am__append_28 = iq2000/crt0.S iq2000/test.o +@CONFIG_IQ2000_TRUE@am__append_29 = iq2000/test +@CONFIG_LIBNOSYS_TRUE@am__append_30 = libnosys/nosys.specs +@CONFIG_LIBNOSYS_TRUE@am__append_31 = libnosys/libnosys.a +@CONFIG_LM32_TRUE@am__append_32 = lm32/crt0.o lm32/sim.ld +@CONFIG_LM32_TRUE@am__append_33 = lm32/libgloss.a +@CONFIG_LM32_TRUE@am__append_34 = lm32/crt0.S +@CONFIG_MOXIE_TRUE@@HAVE_MULTISUBDIR_FALSE@am__append_35 = \ @CONFIG_MOXIE_TRUE@@HAVE_MULTISUBDIR_FALSE@ moxie/moxie-elf-common.ld \ @CONFIG_MOXIE_TRUE@@HAVE_MULTISUBDIR_FALSE@ moxie/qemu.ld \ @CONFIG_MOXIE_TRUE@@HAVE_MULTISUBDIR_FALSE@ moxie/sim.ld \ @CONFIG_MOXIE_TRUE@@HAVE_MULTISUBDIR_FALSE@ moxie/moxiebox.ld -@CONFIG_MOXIE_TRUE@@MOXIE_BUILD_CRT0_TRUE@am__append_33 = moxie/crt0.o -@CONFIG_MOXIE_TRUE@am__append_34 = \ +@CONFIG_MOXIE_TRUE@@MOXIE_BUILD_CRT0_TRUE@am__append_36 = moxie/crt0.o +@CONFIG_MOXIE_TRUE@am__append_37 = \ @CONFIG_MOXIE_TRUE@ moxie/crt0.S -@CONFIG_MOXIE_TRUE@am__append_35 = moxie/libsim.a moxie/libqemu.a -@CONFIG_NIOS2_TRUE@am__append_36 = \ +@CONFIG_MOXIE_TRUE@am__append_38 = moxie/libsim.a moxie/libqemu.a +@CONFIG_NIOS2_TRUE@am__append_39 = \ @CONFIG_NIOS2_TRUE@ nios2/qemu-hosted.ld -@CONFIG_NIOS2_TRUE@am__append_37 = nios2/libnios2.a -@CONFIG_RISCV_TRUE@am__append_38 = \ +@CONFIG_NIOS2_TRUE@am__append_40 = nios2/libnios2.a +@CONFIG_RISCV_TRUE@am__append_41 = \ @CONFIG_RISCV_TRUE@ riscv/nano.specs \ @CONFIG_RISCV_TRUE@ riscv/sim.specs \ @CONFIG_RISCV_TRUE@ riscv/semihost.specs \ @CONFIG_RISCV_TRUE@ riscv/crt0.o -@CONFIG_RISCV_TRUE@am__append_39 = riscv/libgloss.a riscv/libsim.a \ +@CONFIG_RISCV_TRUE@am__append_42 = riscv/libgloss.a riscv/libsim.a \ @CONFIG_RISCV_TRUE@ riscv/libsemihost.a -@CONFIG_V850_TRUE@am__append_40 = v850/crt0.o -@CONFIG_V850_TRUE@am__append_41 = v850/crt0.S -@CONFIG_V850_TRUE@am__append_42 = v850/libsim.a -@CONFIG_WINCE_TRUE@am__append_43 = $(gdbdir) -@CONFIG_WINCE_TRUE@am__append_44 = wince/stub.exe -@CONFIG_XTENSA_TRUE@am__append_45 = -D_LIBGLOSS -I$(srcdir)/xtensa/include -@CONFIG_XTENSA_TRUE@am__append_46 = \ +@CONFIG_V850_TRUE@am__append_43 = v850/crt0.o +@CONFIG_V850_TRUE@am__append_44 = v850/crt0.S +@CONFIG_V850_TRUE@am__append_45 = v850/libsim.a +@CONFIG_WINCE_TRUE@am__append_46 = $(gdbdir) +@CONFIG_WINCE_TRUE@am__append_47 = wince/stub.exe +@CONFIG_XTENSA_TRUE@am__append_48 = -D_LIBGLOSS -I$(srcdir)/xtensa/include +@CONFIG_XTENSA_TRUE@am__append_49 = \ @CONFIG_XTENSA_TRUE@ xtensa/default.specs \ @CONFIG_XTENSA_TRUE@ xtensa/nano.specs \ @CONFIG_XTENSA_TRUE@ xtensa/sim.elf.specs \ @@ -214,27 +219,27 @@ check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3) @CONFIG_XTENSA_TRUE@ xtensa/sys.openocd.specs \ @CONFIG_XTENSA_TRUE@ xtensa/crt0.o -@CONFIG_XTENSA_TRUE@am__append_47 = \ +@CONFIG_XTENSA_TRUE@am__append_50 = \ @CONFIG_XTENSA_TRUE@ xtensa/crt0.S \ @CONFIG_XTENSA_TRUE@ xtensa/crt1-sim.S \ @CONFIG_XTENSA_TRUE@ xtensa/crt1-boards.S -@CONFIG_XTENSA_TRUE@am__append_48 = xtensa/libgloss.a -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_49 = \ +@CONFIG_XTENSA_TRUE@am__append_51 = xtensa/libgloss.a +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_52 = \ @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/app.elf.ld \ @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/crt1-sim.o \ @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/crt1-boards.o -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_50 = xtensa/libsys_qemu.a \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_53 = xtensa/libsys_qemu.a \ @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/libsys_openocd.a -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_51 = xtensa/boards/esp32/memory.elf.ld -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_52 = xtensa/boards/esp32/board.c -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_53 = -I$(srcdir)/xtensa/boards/esp32/include -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_54 = -I$(srcdir)/xtensa/boards/esp32/include -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_55 = xtensa/boards/esp32s3/memory.elf.ld -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_56 = xtensa/boards/esp32s3/board.c -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_57 = -I$(srcdir)/xtensa/boards/esp32s3/include -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_58 = -I$(srcdir)/xtensa/boards/esp32s3/include +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_54 = xtensa/boards/esp32/memory.elf.ld +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_55 = xtensa/boards/esp32/board.c +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_56 = -I$(srcdir)/xtensa/boards/esp32/include +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_57 = -I$(srcdir)/xtensa/boards/esp32/include +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_58 = xtensa/boards/esp32s3/memory.elf.ld +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_59 = xtensa/boards/esp32s3/board.c +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_60 = -I$(srcdir)/xtensa/boards/esp32s3/include +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_61 = -I$(srcdir)/xtensa/boards/esp32s3/include subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ @@ -261,7 +266,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = epiphany/Makefile i386/Makefile m32r/Makefile \ m68hc11/Makefile nds32/Makefile m68k/Makefile pa/Makefile \ - i960/Makefile sparc_leon/Makefile sparc/Makefile mips/Makefile \ + sparc_leon/Makefile sparc/Makefile mips/Makefile \ rs6000/Makefile mn10200/Makefile mn10300/Makefile \ cr16/Makefile cris/Makefile crx/Makefile fr30/Makefile \ frv/Makefile ft32/Makefile mcore/Makefile mep/Makefile \ @@ -406,6 +411,14 @@ d30v_libsim_a_LIBADD = @CONFIG_D30V_TRUE@ d30v/outbyte.$(OBJEXT) \ @CONFIG_D30V_TRUE@ d30v/syscalls.$(OBJEXT) d30v_libsim_a_OBJECTS = $(am_d30v_libsim_a_OBJECTS) +i960_libmon960_a_AR = $(AR) $(ARFLAGS) +i960_libmon960_a_LIBADD = +@CONFIG_I960_TRUE@am_i960_libmon960_a_OBJECTS = putnum.$(OBJEXT) \ +@CONFIG_I960_TRUE@ unlink.$(OBJEXT) i960/mon-read.$(OBJEXT) \ +@CONFIG_I960_TRUE@ i960/mon-write.$(OBJEXT) \ +@CONFIG_I960_TRUE@ i960/mon-syscalls.$(OBJEXT) \ +@CONFIG_I960_TRUE@ i960/mon960.$(OBJEXT) +i960_libmon960_a_OBJECTS = $(am_i960_libmon960_a_OBJECTS) iq2000_libeval_a_AR = $(AR) $(ARFLAGS) iq2000_libeval_a_LIBADD = @CONFIG_IQ2000_TRUE@am_iq2000_libeval_a_OBJECTS = \ @@ -464,16 +477,17 @@ libobjs_a_LIBADD = @CONFIG_BFIN_TRUE@am__objects_3 = bfin/crt0.$(OBJEXT) \ @CONFIG_BFIN_TRUE@ bfin/basiccrt.$(OBJEXT) @CONFIG_CSKY_TRUE@am__objects_4 = csky/crt0.$(OBJEXT) -@CONFIG_IQ2000_TRUE@am__objects_5 = iq2000/crt0.$(OBJEXT) -@CONFIG_LM32_TRUE@am__objects_6 = lm32/crt0.$(OBJEXT) -@CONFIG_MOXIE_TRUE@am__objects_7 = moxie/crt0.$(OBJEXT) -@CONFIG_V850_TRUE@am__objects_8 = v850/crt0.$(OBJEXT) -@CONFIG_XTENSA_TRUE@am__objects_9 = xtensa/crt0.$(OBJEXT) \ +@CONFIG_I960_TRUE@am__objects_5 = i960/crt0.$(OBJEXT) +@CONFIG_IQ2000_TRUE@am__objects_6 = iq2000/crt0.$(OBJEXT) +@CONFIG_LM32_TRUE@am__objects_7 = lm32/crt0.$(OBJEXT) +@CONFIG_MOXIE_TRUE@am__objects_8 = moxie/crt0.$(OBJEXT) +@CONFIG_V850_TRUE@am__objects_9 = v850/crt0.$(OBJEXT) +@CONFIG_XTENSA_TRUE@am__objects_10 = xtensa/crt0.$(OBJEXT) \ @CONFIG_XTENSA_TRUE@ xtensa/crt1-sim.$(OBJEXT) \ @CONFIG_XTENSA_TRUE@ xtensa/crt1-boards.$(OBJEXT) am_libobjs_a_OBJECTS = $(am__objects_3) $(am__objects_4) \ $(am__objects_5) $(am__objects_6) $(am__objects_7) \ - $(am__objects_8) $(am__objects_9) + $(am__objects_8) $(am__objects_9) $(am__objects_10) libobjs_a_OBJECTS = $(am_libobjs_a_OBJECTS) lm32_libgloss_a_AR = $(AR) $(ARFLAGS) lm32_libgloss_a_LIBADD = @@ -602,7 +616,7 @@ riscv_libsemihost_a_LIBADD = riscv_libsemihost_a_OBJECTS = $(am_riscv_libsemihost_a_OBJECTS) riscv_libsim_a_AR = $(AR) $(ARFLAGS) riscv_libsim_a_LIBADD = -@CONFIG_RISCV_TRUE@am__objects_10 = \ +@CONFIG_RISCV_TRUE@am__objects_11 = \ @CONFIG_RISCV_TRUE@ riscv/riscv_libsim_a-sys_access.$(OBJEXT) \ @CONFIG_RISCV_TRUE@ riscv/riscv_libsim_a-sys_chdir.$(OBJEXT) \ @CONFIG_RISCV_TRUE@ riscv/riscv_libsim_a-sys_chmod.$(OBJEXT) \ @@ -635,7 +649,7 @@ riscv_libsim_a_LIBADD = @CONFIG_RISCV_TRUE@ riscv/riscv_libsim_a-sys_utime.$(OBJEXT) \ @CONFIG_RISCV_TRUE@ riscv/riscv_libsim_a-sys_wait.$(OBJEXT) \ @CONFIG_RISCV_TRUE@ riscv/riscv_libsim_a-sys_write.$(OBJEXT) -@CONFIG_RISCV_TRUE@am_riscv_libsim_a_OBJECTS = $(am__objects_10) +@CONFIG_RISCV_TRUE@am_riscv_libsim_a_OBJECTS = $(am__objects_11) riscv_libsim_a_OBJECTS = $(am_riscv_libsim_a_OBJECTS) v850_libsim_a_AR = $(AR) $(ARFLAGS) v850_libsim_a_LIBADD = @@ -657,13 +671,13 @@ v850_libsim_a_LIBADD = v850_libsim_a_OBJECTS = $(am_v850_libsim_a_OBJECTS) xtensa_libgloss_a_AR = $(AR) $(ARFLAGS) xtensa_libgloss_a_LIBADD = -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_11 = xtensa/boards/esp32/xtensa_libgloss_a-board.$(OBJEXT) -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_12 = xtensa/boards/esp32s3/xtensa_libgloss_a-board.$(OBJEXT) +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_12 = xtensa/boards/esp32/xtensa_libgloss_a-board.$(OBJEXT) +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_13 = xtensa/boards/esp32s3/xtensa_libgloss_a-board.$(OBJEXT) @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am_xtensa_libgloss_a_OBJECTS = xtensa/xtensa_libgloss_a-sleep.$(OBJEXT) \ @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/xtensa_libgloss_a-syscalls.$(OBJEXT) \ @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/xtensa_libgloss_a-window-vectors.$(OBJEXT) \ -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__objects_11) \ -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__objects_12) +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__objects_12) \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__objects_13) xtensa_libgloss_a_OBJECTS = $(am_xtensa_libgloss_a_OBJECTS) xtensa_libsys_openocd_a_AR = $(AR) $(ARFLAGS) xtensa_libsys_openocd_a_LIBADD = @@ -733,12 +747,13 @@ SOURCES = $(aarch64_librdimon_a_SOURCES) $(arc_libnsim_a_SOURCES) \ $(arm_librdimon_a_SOURCES) $(arm_librdpmon_a_SOURCES) \ $(bfin_libbfinbsp_a_SOURCES) $(bfin_libsim_a_SOURCES) \ $(csky_libsemi_a_SOURCES) $(d30v_libsim_a_SOURCES) \ - $(iq2000_libeval_a_SOURCES) $(libnosys_libnosys_a_SOURCES) \ - $(libobjs_a_SOURCES) $(lm32_libgloss_a_SOURCES) \ - $(moxie_libqemu_a_SOURCES) $(moxie_libsim_a_SOURCES) \ - $(nios2_libnios2_a_SOURCES) $(riscv_libgloss_a_SOURCES) \ - $(riscv_libsemihost_a_SOURCES) $(riscv_libsim_a_SOURCES) \ - $(v850_libsim_a_SOURCES) $(xtensa_libgloss_a_SOURCES) \ + $(i960_libmon960_a_SOURCES) $(iq2000_libeval_a_SOURCES) \ + $(libnosys_libnosys_a_SOURCES) $(libobjs_a_SOURCES) \ + $(lm32_libgloss_a_SOURCES) $(moxie_libqemu_a_SOURCES) \ + $(moxie_libsim_a_SOURCES) $(nios2_libnios2_a_SOURCES) \ + $(riscv_libgloss_a_SOURCES) $(riscv_libsemihost_a_SOURCES) \ + $(riscv_libsim_a_SOURCES) $(v850_libsim_a_SOURCES) \ + $(xtensa_libgloss_a_SOURCES) \ $(xtensa_libsys_openocd_a_SOURCES) \ $(xtensa_libsys_qemu_a_SOURCES) bfin/sim-test.c iq2000/test.c \ $(wince_stub_exe_SOURCES) @@ -828,7 +843,7 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) -VPATH = @srcdir@ $(am__append_43) +VPATH = @srcdir@ $(am__append_46) AARCH64_OBJTYPE = @AARCH64_OBJTYPE@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -846,7 +861,7 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ $(am__append_45) +CPPFLAGS = @CPPFLAGS@ $(am__append_48) CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -964,16 +979,16 @@ multilibtooldir = $(tooldir)/lib$(MULTISUBDIR) multilibtool_DATA = $(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_23) \ - $(am__append_27) $(am__append_29) $(am__append_32) \ - $(am__append_33) $(am__append_36) $(am__append_38) \ - $(am__append_40) $(am__append_46) $(am__append_49) \ - $(am__append_51) $(am__append_55) + $(am__append_26) $(am__append_30) $(am__append_32) \ + $(am__append_35) $(am__append_36) $(am__append_39) \ + $(am__append_41) $(am__append_43) $(am__append_49) \ + $(am__append_52) $(am__append_54) $(am__append_58) multilibtool_LIBRARIES = $(am__append_2) $(am__append_5) \ $(am__append_9) $(am__append_11) $(am__append_20) \ - $(am__append_21) $(am__append_24) $(am__append_28) \ - $(am__append_30) $(am__append_35) $(am__append_37) \ - $(am__append_39) $(am__append_42) $(am__append_48) \ - $(am__append_50) + $(am__append_21) $(am__append_25) $(am__append_27) \ + $(am__append_31) $(am__append_33) $(am__append_38) \ + $(am__append_40) $(am__append_42) $(am__append_45) \ + $(am__append_51) $(am__append_53) includetooldir = $(tooldir)/include includetool_DATA = $(am__append_16) includesystooldir = $(tooldir)/include/sys @@ -983,9 +998,9 @@ AM_CPPFLAGS = -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 = libobjs.a -libobjs_a_SOURCES = $(am__append_14) $(am__append_19) $(am__append_25) \ - $(am__append_31) $(am__append_34) $(am__append_41) \ - $(am__append_47) +libobjs_a_SOURCES = $(am__append_14) $(am__append_19) $(am__append_24) \ + $(am__append_28) $(am__append_34) $(am__append_37) \ + $(am__append_44) $(am__append_50) FLAGS_TO_PASS = \ "CC=$(CC)" \ "CFLAGS=$(CFLAGS)" \ @@ -1133,6 +1148,14 @@ TEXINFO_TEX = ../texinfo/texinfo.tex @CONFIG_D30V_TRUE@ d30v/outbyte.c \ @CONFIG_D30V_TRUE@ d30v/syscalls.c +@CONFIG_I960_TRUE@i960_libmon960_a_SOURCES = \ +@CONFIG_I960_TRUE@ putnum.c \ +@CONFIG_I960_TRUE@ unlink.c \ +@CONFIG_I960_TRUE@ i960/mon-read.c \ +@CONFIG_I960_TRUE@ i960/mon-write.c \ +@CONFIG_I960_TRUE@ i960/mon-syscalls.S \ +@CONFIG_I960_TRUE@ i960/mon960.c + @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 \ @@ -1334,19 +1357,19 @@ TEXINFO_TEX = ../texinfo/texinfo.tex @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libgloss_a_SOURCES = xtensa/sleep.S \ @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/syscalls.c \ @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/window-vectors.S \ -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_52) \ -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_56) +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_55) \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_59) @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_qemu_a_CPPFLAGS = -DQEMU_SEMIHOSTING \ -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_53) \ -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_57) +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_56) \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_60) @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_qemu_a_SOURCES = \ @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/sim-vectors.S \ @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/sim-call.S \ @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/syscalls.c @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_openocd_a_CPPFLAGS = -DOPENOCD_SEMIHOSTING \ -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_54) \ -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_58) +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_57) \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_61) @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_openocd_a_SOURCES = \ @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/syscalls.c @@ -1359,7 +1382,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/Makefile.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)/csky/Makefile.inc $(srcdir)/d30v/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/moxie/Makefile.inc $(srcdir)/nios2/Makefile.inc $(srcdir)/riscv/Makefile.inc $(srcdir)/v850/Makefile.inc $(srcdir)/wince/Makefile.inc $(srcdir)/xtensa/Makefile.inc $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(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 $(srcdir)/bfin/Makefile.inc $(srcdir)/csky/Makefile.inc $(srcdir)/d30v/Makefile.inc $(srcdir)/i960/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/moxie/Makefile.inc $(srcdir)/nios2/Makefile.inc $(srcdir)/riscv/Makefile.inc $(srcdir)/v850/Makefile.inc $(srcdir)/wince/Makefile.inc $(srcdir)/xtensa/Makefile.inc $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -1381,7 +1404,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)/aarch64/Makefile.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)/csky/Makefile.inc $(srcdir)/d30v/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/moxie/Makefile.inc $(srcdir)/nios2/Makefile.inc $(srcdir)/riscv/Makefile.inc $(srcdir)/v850/Makefile.inc $(srcdir)/wince/Makefile.inc $(srcdir)/xtensa/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 $(srcdir)/bfin/Makefile.inc $(srcdir)/csky/Makefile.inc $(srcdir)/d30v/Makefile.inc $(srcdir)/i960/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/moxie/Makefile.inc $(srcdir)/nios2/Makefile.inc $(srcdir)/riscv/Makefile.inc $(srcdir)/v850/Makefile.inc $(srcdir)/wince/Makefile.inc $(srcdir)/xtensa/Makefile.inc $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -1420,8 +1443,6 @@ m68k/Makefile: $(top_builddir)/config.status $(top_srcdir)/m68k/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ pa/Makefile: $(top_builddir)/config.status $(top_srcdir)/pa/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ -i960/Makefile: $(top_builddir)/config.status $(top_srcdir)/i960/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ sparc_leon/Makefile: $(top_builddir)/config.status $(top_srcdir)/sparc_leon/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ sparc/Makefile: $(top_builddir)/config.status $(top_srcdir)/sparc/Makefile.in @@ -1712,6 +1733,25 @@ d30v/libsim.a: $(d30v_libsim_a_OBJECTS) $(d30v_libsim_a_DEPENDENCIES) $(EXTRA_d3 $(AM_V_at)-rm -f d30v/libsim.a $(AM_V_AR)$(d30v_libsim_a_AR) d30v/libsim.a $(d30v_libsim_a_OBJECTS) $(d30v_libsim_a_LIBADD) $(AM_V_at)$(RANLIB) d30v/libsim.a +i960/$(am__dirstamp): + @$(MKDIR_P) i960 + @: > i960/$(am__dirstamp) +i960/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) i960/$(DEPDIR) + @: > i960/$(DEPDIR)/$(am__dirstamp) +i960/mon-read.$(OBJEXT): i960/$(am__dirstamp) \ + i960/$(DEPDIR)/$(am__dirstamp) +i960/mon-write.$(OBJEXT): i960/$(am__dirstamp) \ + i960/$(DEPDIR)/$(am__dirstamp) +i960/mon-syscalls.$(OBJEXT): i960/$(am__dirstamp) \ + i960/$(DEPDIR)/$(am__dirstamp) +i960/mon960.$(OBJEXT): i960/$(am__dirstamp) \ + i960/$(DEPDIR)/$(am__dirstamp) + +i960/libmon960.a: $(i960_libmon960_a_OBJECTS) $(i960_libmon960_a_DEPENDENCIES) $(EXTRA_i960_libmon960_a_DEPENDENCIES) i960/$(am__dirstamp) + $(AM_V_at)-rm -f i960/libmon960.a + $(AM_V_AR)$(i960_libmon960_a_AR) i960/libmon960.a $(i960_libmon960_a_OBJECTS) $(i960_libmon960_a_LIBADD) + $(AM_V_at)$(RANLIB) i960/libmon960.a iq2000/$(am__dirstamp): @$(MKDIR_P) iq2000 @: > iq2000/$(am__dirstamp) @@ -1830,6 +1870,8 @@ bfin/basiccrt.$(OBJEXT): bfin/$(am__dirstamp) \ bfin/$(DEPDIR)/$(am__dirstamp) csky/crt0.$(OBJEXT): csky/$(am__dirstamp) \ csky/$(DEPDIR)/$(am__dirstamp) +i960/crt0.$(OBJEXT): i960/$(am__dirstamp) \ + i960/$(DEPDIR)/$(am__dirstamp) iq2000/crt0.$(OBJEXT): iq2000/$(am__dirstamp) \ iq2000/$(DEPDIR)/$(am__dirstamp) lm32/$(am__dirstamp): @@ -2363,6 +2405,7 @@ mostlyclean-compile: -rm -f bfin/*.$(OBJEXT) -rm -f csky/*.$(OBJEXT) -rm -f d30v/*.$(OBJEXT) + -rm -f i960/*.$(OBJEXT) -rm -f iq2000/*.$(OBJEXT) -rm -f libnosys/*.$(OBJEXT) -rm -f lm32/*.$(OBJEXT) @@ -2381,6 +2424,7 @@ distclean-compile: @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)/unlink.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@ @@ -2445,6 +2489,11 @@ distclean-compile: @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@i960/$(DEPDIR)/crt0.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@i960/$(DEPDIR)/mon-read.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@i960/$(DEPDIR)/mon-syscalls.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@i960/$(DEPDIR)/mon-write.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@i960/$(DEPDIR)/mon960.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@ @@ -5402,6 +5451,8 @@ distclean-generic: -rm -f d30v/$(DEPDIR)/$(am__dirstamp) -rm -f d30v/$(am__dirstamp) -rm -f doc/$(am__dirstamp) + -rm -f i960/$(DEPDIR)/$(am__dirstamp) + -rm -f i960/$(am__dirstamp) -rm -f iq2000/$(DEPDIR)/$(am__dirstamp) -rm -f iq2000/$(am__dirstamp) -rm -f libnosys/$(DEPDIR)/$(am__dirstamp) @@ -5436,7 +5487,7 @@ clean-am: clean-aminfo clean-binPROGRAMS clean-checkPROGRAMS \ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(DEPDIR) csky/$(DEPDIR) d30v/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) moxie/$(DEPDIR) nios2/$(DEPDIR) riscv/$(DEPDIR) v850/$(DEPDIR) xtensa/$(DEPDIR) xtensa/boards/esp32/$(DEPDIR) xtensa/boards/esp32s3/$(DEPDIR) + -rm -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(DEPDIR) csky/$(DEPDIR) d30v/$(DEPDIR) i960/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) moxie/$(DEPDIR) nios2/$(DEPDIR) riscv/$(DEPDIR) v850/$(DEPDIR) xtensa/$(DEPDIR) xtensa/boards/esp32/$(DEPDIR) xtensa/boards/esp32s3/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-local distclean-tags @@ -5579,7 +5630,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) csky/$(DEPDIR) d30v/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) moxie/$(DEPDIR) nios2/$(DEPDIR) riscv/$(DEPDIR) v850/$(DEPDIR) xtensa/$(DEPDIR) xtensa/boards/esp32/$(DEPDIR) xtensa/boards/esp32s3/$(DEPDIR) + -rm -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(DEPDIR) csky/$(DEPDIR) d30v/$(DEPDIR) i960/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) moxie/$(DEPDIR) nios2/$(DEPDIR) riscv/$(DEPDIR) v850/$(DEPDIR) xtensa/$(DEPDIR) xtensa/boards/esp32/$(DEPDIR) xtensa/boards/esp32s3/$(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 def93ce56..6ba7b9408 100755 --- a/libgloss/configure +++ b/libgloss/configure @@ -657,6 +657,8 @@ CONFIG_LIBNOSYS_FALSE CONFIG_LIBNOSYS_TRUE CONFIG_IQ2000_FALSE CONFIG_IQ2000_TRUE +CONFIG_I960_FALSE +CONFIG_I960_TRUE CONFIG_D30V_FALSE CONFIG_D30V_TRUE CONFIG_CSKY_FALSE @@ -2811,9 +2813,7 @@ case "${target}" in subdirs="$subdirs pa" ;; i960-*-coff) - ac_config_files="$ac_config_files i960/Makefile" - - subdirs="$subdirs i960" + config_i960=true ;; sparc-*leon*-elf* | sparc-*leon*-none*) ac_config_files="$ac_config_files sparc_leon/Makefile" @@ -3045,6 +3045,14 @@ else CONFIG_D30V_FALSE= fi + if test x$config_i960 = xtrue; then + CONFIG_I960_TRUE= + CONFIG_I960_FALSE='#' +else + CONFIG_I960_TRUE='#' + CONFIG_I960_FALSE= +fi + if test x$config_iq2000 = xtrue; then CONFIG_IQ2000_TRUE= CONFIG_IQ2000_FALSE='#' @@ -5408,6 +5416,10 @@ 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_I960_TRUE}" && test -z "${CONFIG_I960_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_I960\" 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 @@ -6087,7 +6099,6 @@ do "nds32/Makefile") CONFIG_FILES="$CONFIG_FILES nds32/Makefile" ;; "m68k/Makefile") CONFIG_FILES="$CONFIG_FILES m68k/Makefile" ;; "pa/Makefile") CONFIG_FILES="$CONFIG_FILES pa/Makefile" ;; - "i960/Makefile") CONFIG_FILES="$CONFIG_FILES i960/Makefile" ;; "sparc_leon/Makefile") CONFIG_FILES="$CONFIG_FILES sparc_leon/Makefile" ;; "sparc/Makefile") CONFIG_FILES="$CONFIG_FILES sparc/Makefile" ;; "mips/Makefile") CONFIG_FILES="$CONFIG_FILES mips/Makefile" ;; diff --git a/libgloss/configure.ac b/libgloss/configure.ac index 81b66a2f8..ec6dec0a0 100644 --- a/libgloss/configure.ac +++ b/libgloss/configure.ac @@ -87,8 +87,7 @@ case "${target}" in subdirs="$subdirs pa" ;; i960-*-coff) - AC_CONFIG_FILES([i960/Makefile]) - subdirs="$subdirs i960" + config_i960=true ;; sparc-*leon*-elf* | sparc-*leon*-none*) AC_CONFIG_FILES([sparc_leon/Makefile]) @@ -248,8 +247,8 @@ 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 csky d30v iq2000 libnosys lm32 moxie nios2 riscv v850 - wince xtensa + aarch64 arc arm bfin csky d30v i960 iq2000 libnosys lm32 moxie nios2 riscv + v850 wince xtensa ], [dnl AM_CONDITIONAL([CONFIG_]m4_toupper(SUBDIR), [test x$config_]SUBDIR = xtrue) ]) diff --git a/libgloss/i960/Makefile.in b/libgloss/i960/Makefile.in deleted file mode 100644 index 0d1b80029..000000000 --- a/libgloss/i960/Makefile.in +++ /dev/null @@ -1,107 +0,0 @@ -# -# - -DESTDIR = -VPATH = @srcdir@ @srcdir@/.. -srcdir = @srcdir@ -objdir = . -srcroot = $(srcdir)/../.. -objroot = $(objdir)/../.. - -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -host_alias = @host_alias@ -target_alias = @target_alias@ - -bindir = @bindir@ -libdir = @libdir@ -tooldir = $(exec_prefix)/$(target_alias) - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ - -# Multilib support variables. -# TOP is used instead of MULTI{BUILD,SRC}TOP. -MULTIDIRS = -MULTISUBDIR = - -SHELL = /bin/sh - -mkinstalldirs = $(SHELL) $(srcroot)/mkinstalldirs - -CC = @CC@ - -AS = @AS@ -AR = @AR@ -LD = @LD@ -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` - -OBJS = putnum.o unlink.o -CFLAGS = -g -SCRIPTS = - -# Here is all of the mon960 stuff -MON_LDFLAGS = -MON_BSP = libmon960.a -MON_CRT0 = crt0.o -MON_OBJS = mon-read.o mon-write.o mon-syscalls.o mon960.o -MON_SCRIPTS = mon960.ld -MON_INSTALL = install-mon - -# 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: ${MON_CRT0} ${MON_BSP} - -# -# here's where we build the board support packages for each target -# -${MON_BSP}: ${OBJS} ${MON_OBJS} - ${AR} ${ARFLAGS} ${MON_BSP} ${MON_OBJS} ${OBJS} - ${RANLIB} ${MON_BSP} - -# -# -# -.c.S: - ${CC} ${CFLAGS_FOR_TARGET} -c $< - -mvme-crt0.o: mvme-crt0.S -mvme-exit.o: mvme-exit.S -mvme-inbyte.o: mvme-inbyte.S -mvme-outbyte.o: mvme-outbyte.S - -clean mostlyclean: - rm -f a.out core *.i *.o *-test *.srec *.dis *.x - -distclean maintainer-clean realclean: clean - rm -f Makefile *~ - -.PHONY: install info install-info clean-info -install: ${MON_INSTALL} - -install-mon: - ${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR} - set -e; for x in ${MON_CRT0} ${MON_BSP}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done - set -e; for x in ${MON_SCRIPTS}; do ${INSTALL_DATA} ${srcdir}/$$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/i960/Makefile.inc b/libgloss/i960/Makefile.inc new file mode 100644 index 000000000..3d1f58bb1 --- /dev/null +++ b/libgloss/i960/Makefile.inc @@ -0,0 +1,16 @@ +multilibtool_DATA += \ + %D%/crt0.o +libobjs_a_SOURCES += \ + %D%/crt0.c + +multilibtool_DATA += \ + %D%/mon960.ld + +multilibtool_LIBRARIES += %D%/libmon960.a +%C%_libmon960_a_SOURCES = \ + putnum.c \ + unlink.c \ + %D%/mon-read.c \ + %D%/mon-write.c \ + %D%/mon-syscalls.S \ + %D%/mon960.c