From 787b83bb9ba9f7508c9808a3acee64dda0140c94 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 26 Dec 2023 21:11:58 -0500 Subject: [PATCH] libgloss: merge msp430 into top-level Makefile Avoid a recursive make to speed things up a bit. A msp430-elf build shows installed objects & libs produce same code. --- libgloss/Makefile.am | 3 + libgloss/Makefile.in | 265 +++++++++++++++++++++++++++-------- libgloss/configure | 19 ++- libgloss/configure.ac | 7 +- libgloss/msp430/Makefile.in | 166 ---------------------- libgloss/msp430/Makefile.inc | 52 +++++++ 6 files changed, 280 insertions(+), 232 deletions(-) delete mode 100644 libgloss/msp430/Makefile.in create mode 100644 libgloss/msp430/Makefile.inc diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am index ccfbfc167..6ae234670 100644 --- a/libgloss/Makefile.am +++ b/libgloss/Makefile.am @@ -112,6 +112,9 @@ endif if CONFIG_MOXIE include moxie/Makefile.inc endif +if CONFIG_MSP430 +include msp430/Makefile.inc +endif if CONFIG_NIOS2 include nios2/Makefile.inc endif diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in index a085dcd9d..38dc2660b 100644 --- a/libgloss/Makefile.in +++ b/libgloss/Makefile.in @@ -192,25 +192,35 @@ check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3) @CONFIG_MOXIE_TRUE@ moxie/crt0.S @CONFIG_MOXIE_TRUE@am__append_38 = moxie/libsim.a moxie/libqemu.a -@CONFIG_NIOS2_TRUE@am__append_39 = \ +@CONFIG_MSP430_TRUE@am__append_39 = msp430/msp430-sim.ld \ +@CONFIG_MSP430_TRUE@ msp430/msp430xl-sim.ld \ +@CONFIG_MSP430_TRUE@ msp430/intr_vectors.ld msp430/gcrt0.o \ +@CONFIG_MSP430_TRUE@ msp430/crt0.o +@CONFIG_MSP430_TRUE@am__append_40 = \ +@CONFIG_MSP430_TRUE@ msp430/gcrt0.S \ +@CONFIG_MSP430_TRUE@ msp430/crt0.S + +@CONFIG_MSP430_TRUE@am__append_41 = msp430/libsim.a msp430/libnosys.a \ +@CONFIG_MSP430_TRUE@ msp430/libcrt.a +@CONFIG_NIOS2_TRUE@am__append_42 = \ @CONFIG_NIOS2_TRUE@ nios2/qemu-hosted.ld -@CONFIG_NIOS2_TRUE@am__append_40 = nios2/libnios2.a -@CONFIG_RISCV_TRUE@am__append_41 = \ +@CONFIG_NIOS2_TRUE@am__append_43 = nios2/libnios2.a +@CONFIG_RISCV_TRUE@am__append_44 = \ @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_42 = riscv/libgloss.a riscv/libsim.a \ +@CONFIG_RISCV_TRUE@am__append_45 = riscv/libgloss.a riscv/libsim.a \ @CONFIG_RISCV_TRUE@ riscv/libsemihost.a -@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_V850_TRUE@am__append_46 = v850/crt0.o +@CONFIG_V850_TRUE@am__append_47 = v850/crt0.S +@CONFIG_V850_TRUE@am__append_48 = v850/libsim.a +@CONFIG_WINCE_TRUE@am__append_49 = $(gdbdir) +@CONFIG_WINCE_TRUE@am__append_50 = wince/stub.exe +@CONFIG_XTENSA_TRUE@am__append_51 = -D_LIBGLOSS -I$(srcdir)/xtensa/include +@CONFIG_XTENSA_TRUE@am__append_52 = \ @CONFIG_XTENSA_TRUE@ xtensa/default.specs \ @CONFIG_XTENSA_TRUE@ xtensa/nano.specs \ @CONFIG_XTENSA_TRUE@ xtensa/sim.elf.specs \ @@ -219,27 +229,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_50 = \ +@CONFIG_XTENSA_TRUE@am__append_53 = \ @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_51 = xtensa/libgloss.a -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_52 = \ +@CONFIG_XTENSA_TRUE@am__append_54 = xtensa/libgloss.a +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_55 = \ @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_53 = xtensa/libsys_qemu.a \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_56 = 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_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 +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_57 = xtensa/boards/esp32/memory.elf.ld +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_58 = xtensa/boards/esp32/board.c +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_59 = -I$(srcdir)/xtensa/boards/esp32/include +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_60 = -I$(srcdir)/xtensa/boards/esp32/include +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_61 = xtensa/boards/esp32s3/memory.elf.ld +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_62 = xtensa/boards/esp32s3/board.c +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_63 = -I$(srcdir)/xtensa/boards/esp32s3/include +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_64 = -I$(srcdir)/xtensa/boards/esp32s3/include subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ @@ -271,9 +281,9 @@ CONFIG_CLEAN_FILES = epiphany/Makefile i386/Makefile m32r/Makefile \ cr16/Makefile cris/Makefile crx/Makefile fr30/Makefile \ frv/Makefile ft32/Makefile mcore/Makefile mep/Makefile \ microblaze/Makefile mt/Makefile visium/Makefile xc16x/Makefile \ - xstormy16/Makefile m32c/Makefile msp430/Makefile rl78/Makefile \ - rx/Makefile spu/Makefile tic6x/Makefile or1k/Makefile \ - pru/Makefile sparc/libsys/Makefile + xstormy16/Makefile m32c/Makefile rl78/Makefile rx/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 \ @@ -481,13 +491,16 @@ libobjs_a_LIBADD = @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_MSP430_TRUE@am__objects_9 = msp430/gcrt0.$(OBJEXT) \ +@CONFIG_MSP430_TRUE@ msp430/crt0.$(OBJEXT) +@CONFIG_V850_TRUE@am__objects_10 = v850/crt0.$(OBJEXT) +@CONFIG_XTENSA_TRUE@am__objects_11 = 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_10) + $(am__objects_8) $(am__objects_9) $(am__objects_10) \ + $(am__objects_11) libobjs_a_OBJECTS = $(am_libobjs_a_OBJECTS) lm32_libgloss_a_AR = $(AR) $(ARFLAGS) lm32_libgloss_a_LIBADD = @@ -526,6 +539,38 @@ moxie_libsim_a_LIBADD = @CONFIG_MOXIE_TRUE@ moxie/sim-write.$(OBJEXT) \ @CONFIG_MOXIE_TRUE@ moxie/stat.$(OBJEXT) moxie_libsim_a_OBJECTS = $(am_moxie_libsim_a_OBJECTS) +msp430_libcrt_a_AR = $(AR) $(ARFLAGS) +msp430_libcrt_a_LIBADD = +@CONFIG_MSP430_TRUE@am_msp430_libcrt_a_OBJECTS = \ +@CONFIG_MSP430_TRUE@ msp430/crt_bss.$(OBJEXT) \ +@CONFIG_MSP430_TRUE@ msp430/crt_high_bss.$(OBJEXT) \ +@CONFIG_MSP430_TRUE@ msp430/crt_movedata.$(OBJEXT) \ +@CONFIG_MSP430_TRUE@ msp430/crt_move_highdata.$(OBJEXT) \ +@CONFIG_MSP430_TRUE@ msp430/crt_main.$(OBJEXT) \ +@CONFIG_MSP430_TRUE@ msp430/crt_callexit.$(OBJEXT) \ +@CONFIG_MSP430_TRUE@ msp430/crt_run_init_array.$(OBJEXT) \ +@CONFIG_MSP430_TRUE@ msp430/crt_run_preinit_array.$(OBJEXT) \ +@CONFIG_MSP430_TRUE@ msp430/crt_run_fini_array.$(OBJEXT) \ +@CONFIG_MSP430_TRUE@ msp430/crt_run_array.$(OBJEXT) +msp430_libcrt_a_OBJECTS = $(am_msp430_libcrt_a_OBJECTS) +msp430_libnosys_a_AR = $(AR) $(ARFLAGS) +msp430_libnosys_a_LIBADD = +@CONFIG_MSP430_TRUE@am_msp430_libnosys_a_OBJECTS = \ +@CONFIG_MSP430_TRUE@ msp430/ciosyscalls.$(OBJEXT) \ +@CONFIG_MSP430_TRUE@ msp430/cio.$(OBJEXT) \ +@CONFIG_MSP430_TRUE@ msp430/write.$(OBJEXT) \ +@CONFIG_MSP430_TRUE@ msp430/unlink.$(OBJEXT) \ +@CONFIG_MSP430_TRUE@ msp430/sbrk.$(OBJEXT) +msp430_libnosys_a_OBJECTS = $(am_msp430_libnosys_a_OBJECTS) +msp430_libsim_a_AR = $(AR) $(ARFLAGS) +msp430_libsim_a_LIBADD = +@CONFIG_MSP430_TRUE@am_msp430_libsim_a_OBJECTS = \ +@CONFIG_MSP430_TRUE@ msp430/syscalls.$(OBJEXT) \ +@CONFIG_MSP430_TRUE@ msp430/cio.$(OBJEXT) \ +@CONFIG_MSP430_TRUE@ msp430/write.$(OBJEXT) \ +@CONFIG_MSP430_TRUE@ msp430/unlink.$(OBJEXT) \ +@CONFIG_MSP430_TRUE@ msp430/sbrk.$(OBJEXT) +msp430_libsim_a_OBJECTS = $(am_msp430_libsim_a_OBJECTS) nios2_libnios2_a_AR = $(AR) $(ARFLAGS) nios2_libnios2_a_LIBADD = @CONFIG_NIOS2_TRUE@am_nios2_libnios2_a_OBJECTS = \ @@ -616,7 +661,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_11 = \ +@CONFIG_RISCV_TRUE@am__objects_12 = \ @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) \ @@ -649,7 +694,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_11) +@CONFIG_RISCV_TRUE@am_riscv_libsim_a_OBJECTS = $(am__objects_12) riscv_libsim_a_OBJECTS = $(am_riscv_libsim_a_OBJECTS) v850_libsim_a_AR = $(AR) $(ARFLAGS) v850_libsim_a_LIBADD = @@ -671,13 +716,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_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_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_13 = xtensa/boards/esp32/xtensa_libgloss_a-board.$(OBJEXT) +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_14 = 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_12) \ -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__objects_13) +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__objects_13) \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__objects_14) xtensa_libgloss_a_OBJECTS = $(am_xtensa_libgloss_a_OBJECTS) xtensa_libsys_openocd_a_AR = $(AR) $(ARFLAGS) xtensa_libsys_openocd_a_LIBADD = @@ -750,10 +795,11 @@ SOURCES = $(aarch64_librdimon_a_SOURCES) $(arc_libnsim_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) \ + $(moxie_libsim_a_SOURCES) $(msp430_libcrt_a_SOURCES) \ + $(msp430_libnosys_a_SOURCES) $(msp430_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) @@ -843,7 +889,7 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) -VPATH = @srcdir@ $(am__append_46) +VPATH = @srcdir@ $(am__append_49) AARCH64_OBJTYPE = @AARCH64_OBJTYPE@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -861,7 +907,7 @@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ $(am__append_48) +CPPFLAGS = @CPPFLAGS@ $(am__append_51) CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -983,14 +1029,15 @@ multilibtool_DATA = $(am__append_3) $(am__append_6) $(am__append_7) \ $(am__append_18) $(am__append_22) $(am__append_23) \ $(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) + $(am__append_42) $(am__append_44) $(am__append_46) \ + $(am__append_52) $(am__append_55) $(am__append_57) \ + $(am__append_61) multilibtool_LIBRARIES = $(am__append_2) $(am__append_5) \ $(am__append_9) $(am__append_11) $(am__append_20) \ $(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) + $(am__append_41) $(am__append_43) $(am__append_45) \ + $(am__append_48) $(am__append_54) $(am__append_56) includetooldir = $(tooldir)/include includetool_DATA = $(am__append_16) includesystooldir = $(tooldir)/include/sys @@ -1008,7 +1055,7 @@ AM_LDFLAGS = $(AM_LDFLAGS_$(subst /,_,$(@D))) $(AM_LDFLAGS_$(subst -,_,$(subst / noinst_LIBRARIES = libobjs.a 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) + $(am__append_40) $(am__append_47) $(am__append_53) FLAGS_TO_PASS = \ "CC=$(CC)" \ "CFLAGS=$(CFLAGS)" \ @@ -1233,6 +1280,32 @@ TEXINFO_TEX = ../texinfo/texinfo.tex @CONFIG_MOXIE_TRUE@ moxie/sim-lseek.c \ @CONFIG_MOXIE_TRUE@ moxie/sim-read.S +@CONFIG_MSP430_TRUE@msp430_libsim_a_SOURCES = \ +@CONFIG_MSP430_TRUE@ msp430/syscalls.S \ +@CONFIG_MSP430_TRUE@ msp430/cio.S \ +@CONFIG_MSP430_TRUE@ msp430/write.c \ +@CONFIG_MSP430_TRUE@ msp430/unlink.c \ +@CONFIG_MSP430_TRUE@ msp430/sbrk.c + +@CONFIG_MSP430_TRUE@msp430_libnosys_a_SOURCES = \ +@CONFIG_MSP430_TRUE@ msp430/ciosyscalls.S \ +@CONFIG_MSP430_TRUE@ msp430/cio.S \ +@CONFIG_MSP430_TRUE@ msp430/write.c \ +@CONFIG_MSP430_TRUE@ msp430/unlink.c \ +@CONFIG_MSP430_TRUE@ msp430/sbrk.c + +@CONFIG_MSP430_TRUE@msp430_libcrt_a_SOURCES = \ +@CONFIG_MSP430_TRUE@ msp430/crt_bss.S \ +@CONFIG_MSP430_TRUE@ msp430/crt_high_bss.S \ +@CONFIG_MSP430_TRUE@ msp430/crt_movedata.S \ +@CONFIG_MSP430_TRUE@ msp430/crt_move_highdata.S \ +@CONFIG_MSP430_TRUE@ msp430/crt_main.S \ +@CONFIG_MSP430_TRUE@ msp430/crt_callexit.S \ +@CONFIG_MSP430_TRUE@ msp430/crt_run_init_array.S \ +@CONFIG_MSP430_TRUE@ msp430/crt_run_preinit_array.S \ +@CONFIG_MSP430_TRUE@ msp430/crt_run_fini_array.S \ +@CONFIG_MSP430_TRUE@ msp430/crt_run_array.S + @CONFIG_NIOS2_TRUE@nios2_libnios2_a_SOURCES = \ @CONFIG_NIOS2_TRUE@ nios2/crt0.S \ @CONFIG_NIOS2_TRUE@ nios2/io-close.c \ @@ -1365,19 +1438,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_55) \ -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_59) +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_58) \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_62) @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_56) \ -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_60) +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_59) \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_63) @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_57) \ -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_61) +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_60) \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_64) @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_openocd_a_SOURCES = \ @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/syscalls.c @@ -1390,7 +1463,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)/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) +$(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)/msp430/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*) \ @@ -1412,7 +1485,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)/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_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)/msp430/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 @@ -1491,8 +1564,6 @@ xstormy16/Makefile: $(top_builddir)/config.status $(top_srcdir)/xstormy16/Makefi cd $(top_builddir) && $(SHELL) ./config.status $@ m32c/Makefile: $(top_builddir)/config.status $(top_srcdir)/m32c/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ -msp430/Makefile: $(top_builddir)/config.status $(top_srcdir)/msp430/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ rl78/Makefile: $(top_builddir)/config.status $(top_srcdir)/rl78/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ rx/Makefile: $(top_builddir)/config.status $(top_srcdir)/rx/Makefile.in @@ -1898,6 +1969,16 @@ moxie/$(DEPDIR)/$(am__dirstamp): @: > moxie/$(DEPDIR)/$(am__dirstamp) moxie/crt0.$(OBJEXT): moxie/$(am__dirstamp) \ moxie/$(DEPDIR)/$(am__dirstamp) +msp430/$(am__dirstamp): + @$(MKDIR_P) msp430 + @: > msp430/$(am__dirstamp) +msp430/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) msp430/$(DEPDIR) + @: > msp430/$(DEPDIR)/$(am__dirstamp) +msp430/gcrt0.$(OBJEXT): msp430/$(am__dirstamp) \ + msp430/$(DEPDIR)/$(am__dirstamp) +msp430/crt0.$(OBJEXT): msp430/$(am__dirstamp) \ + msp430/$(DEPDIR)/$(am__dirstamp) v850/$(am__dirstamp): @$(MKDIR_P) v850 @: > v850/$(am__dirstamp) @@ -1978,6 +2059,53 @@ moxie/libsim.a: $(moxie_libsim_a_OBJECTS) $(moxie_libsim_a_DEPENDENCIES) $(EXTRA $(AM_V_at)-rm -f moxie/libsim.a $(AM_V_AR)$(moxie_libsim_a_AR) moxie/libsim.a $(moxie_libsim_a_OBJECTS) $(moxie_libsim_a_LIBADD) $(AM_V_at)$(RANLIB) moxie/libsim.a +msp430/crt_bss.$(OBJEXT): msp430/$(am__dirstamp) \ + msp430/$(DEPDIR)/$(am__dirstamp) +msp430/crt_high_bss.$(OBJEXT): msp430/$(am__dirstamp) \ + msp430/$(DEPDIR)/$(am__dirstamp) +msp430/crt_movedata.$(OBJEXT): msp430/$(am__dirstamp) \ + msp430/$(DEPDIR)/$(am__dirstamp) +msp430/crt_move_highdata.$(OBJEXT): msp430/$(am__dirstamp) \ + msp430/$(DEPDIR)/$(am__dirstamp) +msp430/crt_main.$(OBJEXT): msp430/$(am__dirstamp) \ + msp430/$(DEPDIR)/$(am__dirstamp) +msp430/crt_callexit.$(OBJEXT): msp430/$(am__dirstamp) \ + msp430/$(DEPDIR)/$(am__dirstamp) +msp430/crt_run_init_array.$(OBJEXT): msp430/$(am__dirstamp) \ + msp430/$(DEPDIR)/$(am__dirstamp) +msp430/crt_run_preinit_array.$(OBJEXT): msp430/$(am__dirstamp) \ + msp430/$(DEPDIR)/$(am__dirstamp) +msp430/crt_run_fini_array.$(OBJEXT): msp430/$(am__dirstamp) \ + msp430/$(DEPDIR)/$(am__dirstamp) +msp430/crt_run_array.$(OBJEXT): msp430/$(am__dirstamp) \ + msp430/$(DEPDIR)/$(am__dirstamp) + +msp430/libcrt.a: $(msp430_libcrt_a_OBJECTS) $(msp430_libcrt_a_DEPENDENCIES) $(EXTRA_msp430_libcrt_a_DEPENDENCIES) msp430/$(am__dirstamp) + $(AM_V_at)-rm -f msp430/libcrt.a + $(AM_V_AR)$(msp430_libcrt_a_AR) msp430/libcrt.a $(msp430_libcrt_a_OBJECTS) $(msp430_libcrt_a_LIBADD) + $(AM_V_at)$(RANLIB) msp430/libcrt.a +msp430/ciosyscalls.$(OBJEXT): msp430/$(am__dirstamp) \ + msp430/$(DEPDIR)/$(am__dirstamp) +msp430/cio.$(OBJEXT): msp430/$(am__dirstamp) \ + msp430/$(DEPDIR)/$(am__dirstamp) +msp430/write.$(OBJEXT): msp430/$(am__dirstamp) \ + msp430/$(DEPDIR)/$(am__dirstamp) +msp430/unlink.$(OBJEXT): msp430/$(am__dirstamp) \ + msp430/$(DEPDIR)/$(am__dirstamp) +msp430/sbrk.$(OBJEXT): msp430/$(am__dirstamp) \ + msp430/$(DEPDIR)/$(am__dirstamp) + +msp430/libnosys.a: $(msp430_libnosys_a_OBJECTS) $(msp430_libnosys_a_DEPENDENCIES) $(EXTRA_msp430_libnosys_a_DEPENDENCIES) msp430/$(am__dirstamp) + $(AM_V_at)-rm -f msp430/libnosys.a + $(AM_V_AR)$(msp430_libnosys_a_AR) msp430/libnosys.a $(msp430_libnosys_a_OBJECTS) $(msp430_libnosys_a_LIBADD) + $(AM_V_at)$(RANLIB) msp430/libnosys.a +msp430/syscalls.$(OBJEXT): msp430/$(am__dirstamp) \ + msp430/$(DEPDIR)/$(am__dirstamp) + +msp430/libsim.a: $(msp430_libsim_a_OBJECTS) $(msp430_libsim_a_DEPENDENCIES) $(EXTRA_msp430_libsim_a_DEPENDENCIES) msp430/$(am__dirstamp) + $(AM_V_at)-rm -f msp430/libsim.a + $(AM_V_AR)$(msp430_libsim_a_AR) msp430/libsim.a $(msp430_libsim_a_OBJECTS) $(msp430_libsim_a_LIBADD) + $(AM_V_at)$(RANLIB) msp430/libsim.a nios2/$(am__dirstamp): @$(MKDIR_P) nios2 @: > nios2/$(am__dirstamp) @@ -2418,6 +2546,7 @@ mostlyclean-compile: -rm -f libnosys/*.$(OBJEXT) -rm -f lm32/*.$(OBJEXT) -rm -f moxie/*.$(OBJEXT) + -rm -f msp430/*.$(OBJEXT) -rm -f nios2/*.$(OBJEXT) -rm -f riscv/*.$(OBJEXT) -rm -f v850/*.$(OBJEXT) @@ -2571,6 +2700,24 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/sim-unlink.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/sim-write.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/stat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@msp430/$(DEPDIR)/cio.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@msp430/$(DEPDIR)/ciosyscalls.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@msp430/$(DEPDIR)/crt0.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@msp430/$(DEPDIR)/crt_bss.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@msp430/$(DEPDIR)/crt_callexit.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@msp430/$(DEPDIR)/crt_high_bss.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@msp430/$(DEPDIR)/crt_main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@msp430/$(DEPDIR)/crt_move_highdata.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@msp430/$(DEPDIR)/crt_movedata.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@msp430/$(DEPDIR)/crt_run_array.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@msp430/$(DEPDIR)/crt_run_fini_array.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@msp430/$(DEPDIR)/crt_run_init_array.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@msp430/$(DEPDIR)/crt_run_preinit_array.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@msp430/$(DEPDIR)/gcrt0.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@msp430/$(DEPDIR)/sbrk.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@msp430/$(DEPDIR)/syscalls.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@msp430/$(DEPDIR)/unlink.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@msp430/$(DEPDIR)/write.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@nios2/$(DEPDIR)/nios2_libnios2_a-crt0.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@nios2/$(DEPDIR)/nios2_libnios2_a-getpid.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@nios2/$(DEPDIR)/nios2_libnios2_a-io-close.Po@am__quote@ @@ -5469,6 +5616,8 @@ distclean-generic: -rm -f lm32/$(am__dirstamp) -rm -f moxie/$(DEPDIR)/$(am__dirstamp) -rm -f moxie/$(am__dirstamp) + -rm -f msp430/$(DEPDIR)/$(am__dirstamp) + -rm -f msp430/$(am__dirstamp) -rm -f nios2/$(DEPDIR)/$(am__dirstamp) -rm -f nios2/$(am__dirstamp) -rm -f riscv/$(DEPDIR)/$(am__dirstamp) @@ -5495,7 +5644,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) 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 -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(DEPDIR) csky/$(DEPDIR) d30v/$(DEPDIR) i960/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) moxie/$(DEPDIR) msp430/$(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 @@ -5638,7 +5787,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) 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 -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(DEPDIR) csky/$(DEPDIR) d30v/$(DEPDIR) i960/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) moxie/$(DEPDIR) msp430/$(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 c94b8806f..0a0e607c3 100755 --- a/libgloss/configure +++ b/libgloss/configure @@ -651,6 +651,8 @@ CONFIG_RISCV_FALSE CONFIG_RISCV_TRUE CONFIG_NIOS2_FALSE CONFIG_NIOS2_TRUE +CONFIG_MSP430_FALSE +CONFIG_MSP430_TRUE CONFIG_MOXIE_FALSE CONFIG_MOXIE_TRUE CONFIG_LM32_FALSE @@ -2948,9 +2950,7 @@ case "${target}" in subdirs="$subdirs m32c" ;; msp430-*-elf*) - ac_config_files="$ac_config_files msp430/Makefile" - - subdirs="$subdirs msp430" + config_msp430=true config_libnosys=false ;; rl78*-*-elf) @@ -3087,6 +3087,14 @@ else CONFIG_MOXIE_FALSE= fi + if test x$config_msp430 = xtrue; then + CONFIG_MSP430_TRUE= + CONFIG_MSP430_FALSE='#' +else + CONFIG_MSP430_TRUE='#' + CONFIG_MSP430_FALSE= +fi + if test x$config_nios2 = xtrue; then CONFIG_NIOS2_TRUE= CONFIG_NIOS2_FALSE='#' @@ -5622,6 +5630,10 @@ if test -z "${CONFIG_MOXIE_TRUE}" && test -z "${CONFIG_MOXIE_FALSE}"; then as_fn_error $? "conditional \"CONFIG_MOXIE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${CONFIG_MSP430_TRUE}" && test -z "${CONFIG_MSP430_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_MSP430\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${CONFIG_NIOS2_TRUE}" && test -z "${CONFIG_NIOS2_FALSE}"; then as_fn_error $? "conditional \"CONFIG_NIOS2\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -6305,7 +6317,6 @@ do "xc16x/Makefile") CONFIG_FILES="$CONFIG_FILES xc16x/Makefile" ;; "xstormy16/Makefile") CONFIG_FILES="$CONFIG_FILES xstormy16/Makefile" ;; "m32c/Makefile") CONFIG_FILES="$CONFIG_FILES m32c/Makefile" ;; - "msp430/Makefile") CONFIG_FILES="$CONFIG_FILES msp430/Makefile" ;; "rl78/Makefile") CONFIG_FILES="$CONFIG_FILES rl78/Makefile" ;; "rx/Makefile") CONFIG_FILES="$CONFIG_FILES rx/Makefile" ;; "spu/Makefile") CONFIG_FILES="$CONFIG_FILES spu/Makefile" ;; diff --git a/libgloss/configure.ac b/libgloss/configure.ac index 575565c6a..e1659d880 100644 --- a/libgloss/configure.ac +++ b/libgloss/configure.ac @@ -200,8 +200,7 @@ case "${target}" in subdirs="$subdirs m32c" ;; msp430-*-elf*) - AC_CONFIG_FILES([msp430/Makefile]) - subdirs="$subdirs msp430" + config_msp430=true config_libnosys=false ;; rl78*-*-elf) @@ -247,8 +246,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 i960 iq2000 libnosys lm32 moxie nios2 riscv - v850 wince xtensa + aarch64 arc arm bfin csky d30v i960 iq2000 libnosys lm32 moxie msp430 nios2 + riscv v850 wince xtensa ], [dnl AM_CONDITIONAL([CONFIG_]m4_toupper(SUBDIR), [test x$config_]SUBDIR = xtrue) ]) diff --git a/libgloss/msp430/Makefile.in b/libgloss/msp430/Makefile.in deleted file mode 100644 index 62c8a280b..000000000 --- a/libgloss/msp430/Makefile.in +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright (c) 2008-2014 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing to use, modify, -# copy, or redistribute it subject to the terms and conditions of the BSD -# License. This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY expressed or implied, including the implied warranties -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. A copy of this license -# is available at http://www.opensource.org/licenses. Any Red Hat trademarks that -# are incorporated in the source code or documentation are not subject to the BSD -# License and may only be used or replicated with the express permission of -# Red Hat, Inc. - -# Makefile for libgloss/msp430. - -DESTDIR = -VPATH = @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) - -# 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 - -CC = @CC@ - -AS = @AS@ -AR = @AR@ -LD = @LD@ -RANLIB = @RANLIB@ -AR_FLAGS = rc - -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` - -SCRIPTS = $(srcdir)/msp430-sim.ld -SCRIPTS += $(srcdir)/msp430xl-sim.ld -SCRIPTS += $(srcdir)/intr_vectors.ld - -CRT = gcrt0.o crt0.o -SIM_BSP = libsim.a -LIB_NOSYS = libnosys.a -LIB_CRT = libcrt.a - -SIM_OBJS = syscalls.o \ - cio.o \ - write.o \ - unlink.o \ - sbrk.o - -NOSYS_OBJS = ciosyscalls.o \ - cio.o \ - write.o \ - unlink.o \ - sbrk.o - -CRT_OBJS = \ - crt_bss.o \ - crt_high_bss.o \ - crt_movedata.o \ - crt_move_highdata.o \ - crt_main.o \ - crt_callexit.o \ - crt_run_init_array.o \ - crt_run_preinit_array.o \ - crt_run_fini_array.o \ - crt_run_array.o - -#### Host specific Makefile fragment comes in here. -@host_makefile_frag@ - - -all: $(CRT) $(SIM_BSP) $(LIB_NOSYS) $(LIB_CRT) copy_scripts_to_objdir - -$(SIM_BSP): $(SIM_OBJS) - $(AR) $(ARFLAGS) $@ $? - $(RANLIB) $@ - -$(LIB_NOSYS): $(NOSYS_OBJS) - $(AR) $(ARFLAGS) $@ $? - $(RANLIB) $@ - -$(LIB_CRT): $(CRT_OBJS) - $(AR) $(ARFLAGS) $@ $? - $(RANLIB) $@ - -copy_scripts_to_objdir: $(SCRIPTS) - cp $(SCRIPTS) $(objdir) - -# Dependencies - -SDEPS = $(srcdir)/cio.h - -abort.o : $(SDEPS) -argv.o : $(SDEPS) -argvlen.o : $(SDEPS) -chdir.o : $(SDEPS) -chmod.o : $(SDEPS) -close.o : $(SDEPS) -exit.o : $(SDEPS) -fstat.o : $(SDEPS) -getpid.o : $(SDEPS) -gettimeofday.o : $(SDEPS) -gcrt0.o: gcrt0.S crt0.S -kill.o : $(SDEPS) -link.o : $(SDEPS) -lseek.o : $(SDEPS) -mcount.o : $(SDEPS) -open.o : $(SDEPS) -read.o : $(SDEPS) -sigprocmask.o : $(SDEPS) -sleep.o : $(SDEPS) -stat.o : $(SDEPS) -time.o : $(SDEPS) -times.o : $(SDEPS) -unlink.o : $(SDEPS) -utime.o : $(SDEPS) -write.o : $(SDEPS) - -install: $(CRT) $(SIM_BSP) $(LIB_NOSYS) $(LIB_CRT) $(SCRIPTS) - mkdir -p $(DESTDIR)$(tooldir)/lib${MULTISUBDIR} - for c in $(CRT) $(SIM_BSP) $(LIB_NOSYS) $(LIB_CRT); do \ - $(INSTALL_DATA) $$c $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$$c ;\ - done - for c in $(SCRIPTS); do \ - b=`basename $$c`; \ - $(INSTALL_DATA) $$c $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$$b ;\ - done - -clean mostlyclean: - rm -f *.o *.a - -distclean maintainer-clean realclean: clean - rm -f Makefile - -.PHONY: info dvi doc install-info clean-info -info doc dvi: -install-info: -clean-info: - -Makefile: Makefile.in ../config.status - cd .. && $(SHELL) config.status diff --git a/libgloss/msp430/Makefile.inc b/libgloss/msp430/Makefile.inc new file mode 100644 index 000000000..38355343a --- /dev/null +++ b/libgloss/msp430/Makefile.inc @@ -0,0 +1,52 @@ +## Copyright (c) 2008-2014 Red Hat, Inc. All rights reserved. +## +## This copyrighted material is made available to anyone wishing to use, modify, +## copy, or redistribute it subject to the terms and conditions of the BSD +## License. This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY expressed or implied, including the implied warranties +## of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. A copy of this license +## is available at http://www.opensource.org/licenses. Any Red Hat trademarks that +## are incorporated in the source code or documentation are not subject to the BSD +## License and may only be used or replicated with the express permission of +## Red Hat, Inc. + +multilibtool_DATA += \ + %D%/msp430-sim.ld \ + %D%/msp430xl-sim.ld \ + %D%/intr_vectors.ld + +multilibtool_DATA += \ + %D%/gcrt0.o \ + %D%/crt0.o +libobjs_a_SOURCES += \ + %D%/gcrt0.S \ + %D%/crt0.S + +multilibtool_LIBRARIES += %D%/libsim.a +%C%_libsim_a_SOURCES = \ + %D%/syscalls.S \ + %D%/cio.S \ + %D%/write.c \ + %D%/unlink.c \ + %D%/sbrk.c + +multilibtool_LIBRARIES += %D%/libnosys.a +%C%_libnosys_a_SOURCES = \ + %D%/ciosyscalls.S \ + %D%/cio.S \ + %D%/write.c \ + %D%/unlink.c \ + %D%/sbrk.c + +multilibtool_LIBRARIES += %D%/libcrt.a +%C%_libcrt_a_SOURCES = \ + %D%/crt_bss.S \ + %D%/crt_high_bss.S \ + %D%/crt_movedata.S \ + %D%/crt_move_highdata.S \ + %D%/crt_main.S \ + %D%/crt_callexit.S \ + %D%/crt_run_init_array.S \ + %D%/crt_run_preinit_array.S \ + %D%/crt_run_fini_array.S \ + %D%/crt_run_array.S