From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id B9C213858CDB; Sat, 30 Dec 2023 02:04:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B9C213858CDB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1703901862; bh=ytensdba9F6R1mErDjS1ZVeSgySIswvzqzntr8IDZWc=; h=From:To:Subject:Date:From; b=vOCqnpeqWgABIQ6bvX53L0n7EGhvJlBmRKyGauYQ/fDHmzQGhU1U1VBKh1+4Mtlu9 sN5Cr7excipXWdBDQN8oBclfGj142I40eSpz796k5JOLbuL9vkJjU62olccjn7NTO2 hyFGYHqKtJTg2CBQ2tJcihrVDjE/diyHHvPOnlcc= 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/main] libgloss: xtensa: fix crt0.o rule X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/main X-Git-Oldrev: ddb614993a78bf2cdf2ed269617f7f552490e76f X-Git-Newrev: 98230b7db1bab77e5fce817ed8c81dd7c577372c Message-Id: <20231230020422.B9C213858CDB@sourceware.org> Date: Sat, 30 Dec 2023 02:04:22 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D98230b7db1b= ab77e5fce817ed8c81dd7c577372c commit 98230b7db1bab77e5fce817ed8c81dd7c577372c Author: Mike Frysinger Date: Wed Dec 27 02:37:30 2023 -0500 libgloss: xtensa: fix crt0.o rule =20 Don't hardcode a custom rule for this -- reuse libobjs_a_SOURCES which was designed for this exact scenario. Diff: --- libgloss/Makefile.in | 82 ++++++++++++++++++++++++++--------------= ---- libgloss/xtensa/Makefile.inc | 7 ++-- 2 files changed, 52 insertions(+), 37 deletions(-) diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in index c35f260ee..429e48ac7 100644 --- a/libgloss/Makefile.in +++ b/libgloss/Makefile.in @@ -200,22 +200,27 @@ check_PROGRAMS =3D $(am__EXEEXT_2) $(am__EXEEXT_3) @CONFIG_XTENSA_TRUE@ xtensa/sys.openocd.specs \ @CONFIG_XTENSA_TRUE@ xtensa/crt0.o =20 -@CONFIG_XTENSA_TRUE@am__append_40 =3D xtensa/libgloss.a -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_41 =3D \ +@CONFIG_XTENSA_TRUE@am__append_40 =3D \ +@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_41 =3D xtensa/libgloss.a +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_42 =3D \ @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 =20 -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_42 =3D xtensa/l= ibsys_qemu.a \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_43 =3D xtensa/l= ibsys_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_T= RUE@am__append_43 =3D xtensa/boards/esp32/memory.elf.ld -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_T= RUE@am__append_44 =3D xtensa/boards/esp32/board.c -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_T= RUE@am__append_45 =3D -I$(srcdir)/xtensa/boards/esp32/include +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_T= RUE@am__append_44 =3D xtensa/boards/esp32/memory.elf.ld +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_T= RUE@am__append_45 =3D xtensa/boards/esp32/board.c @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_T= RUE@am__append_46 =3D -I$(srcdir)/xtensa/boards/esp32/include -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP= _TRUE@am__append_47 =3D xtensa/boards/esp32s3/memory.elf.ld -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP= _TRUE@am__append_48 =3D xtensa/boards/esp32s3/board.c -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP= _TRUE@am__append_49 =3D -I$(srcdir)/xtensa/boards/esp32s3/include +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_T= RUE@am__append_47 =3D -I$(srcdir)/xtensa/boards/esp32/include +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP= _TRUE@am__append_48 =3D xtensa/boards/esp32s3/memory.elf.ld +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP= _TRUE@am__append_49 =3D xtensa/boards/esp32s3/board.c @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP= _TRUE@am__append_50 =3D -I$(srcdir)/xtensa/boards/esp32s3/include +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP= _TRUE@am__append_51 =3D -I$(srcdir)/xtensa/boards/esp32s3/include subdir =3D . ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps =3D $(top_srcdir)/../config/depstand.m4 \ @@ -446,8 +451,11 @@ libobjs_a_LIBADD =3D @CONFIG_CSKY_TRUE@am__objects_4 =3D csky/crt0.$(OBJEXT) @CONFIG_IQ2000_TRUE@am__objects_5 =3D iq2000/crt0.$(OBJEXT) @CONFIG_LM32_TRUE@am__objects_6 =3D lm32/crt0.$(OBJEXT) +@CONFIG_XTENSA_TRUE@am__objects_7 =3D xtensa/crt0.$(OBJEXT) \ +@CONFIG_XTENSA_TRUE@ xtensa/crt1-sim.$(OBJEXT) \ +@CONFIG_XTENSA_TRUE@ xtensa/crt1-boards.$(OBJEXT) am_libobjs_a_OBJECTS =3D $(am__objects_3) $(am__objects_4) \ - $(am__objects_5) $(am__objects_6) + $(am__objects_5) $(am__objects_6) $(am__objects_7) libobjs_a_OBJECTS =3D $(am_libobjs_a_OBJECTS) lm32_libgloss_a_AR =3D $(AR) $(ARFLAGS) lm32_libgloss_a_LIBADD =3D @@ -544,7 +552,7 @@ riscv_libsemihost_a_LIBADD =3D riscv_libsemihost_a_OBJECTS =3D $(am_riscv_libsemihost_a_OBJECTS) riscv_libsim_a_AR =3D $(AR) $(ARFLAGS) riscv_libsim_a_LIBADD =3D -@CONFIG_RISCV_TRUE@am__objects_7 =3D \ +@CONFIG_RISCV_TRUE@am__objects_8 =3D \ @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) \ @@ -577,17 +585,17 @@ riscv_libsim_a_LIBADD =3D @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 =3D $(am__objects_7) +@CONFIG_RISCV_TRUE@am_riscv_libsim_a_OBJECTS =3D $(am__objects_8) riscv_libsim_a_OBJECTS =3D $(am_riscv_libsim_a_OBJECTS) xtensa_libgloss_a_AR =3D $(AR) $(ARFLAGS) xtensa_libgloss_a_LIBADD =3D -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_T= RUE@am__objects_8 =3D xtensa/boards/esp32/xtensa_libgloss_a-board.$(OBJEXT) -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP= _TRUE@am__objects_9 =3D xtensa/boards/esp32s3/xtensa_libgloss_a-board.$(OBJ= EXT) +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_T= RUE@am__objects_9 =3D xtensa/boards/esp32/xtensa_libgloss_a-board.$(OBJEXT) +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP= _TRUE@am__objects_10 =3D xtensa/boards/esp32s3/xtensa_libgloss_a-board.$(OB= JEXT) @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am_xtensa_libgloss_a_OBJEC= TS =3D 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_8) \ -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__objects_9) +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__objects_9) \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__objects_10) xtensa_libgloss_a_OBJECTS =3D $(am_xtensa_libgloss_a_OBJECTS) xtensa_libsys_openocd_a_AR =3D $(AR) $(ARFLAGS) xtensa_libsys_openocd_a_LIBADD =3D @@ -888,13 +896,13 @@ 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_23) \ $(am__append_27) $(am__append_29) $(am__append_32) \ - $(am__append_34) $(am__append_39) $(am__append_41) \ - $(am__append_43) $(am__append_47) + $(am__append_34) $(am__append_39) $(am__append_42) \ + $(am__append_44) $(am__append_48) multilibtool_LIBRARIES =3D $(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_33) $(am__append_35) \ - $(am__append_40) $(am__append_42) + $(am__append_41) $(am__append_43) includetooldir =3D $(tooldir)/include includetool_DATA =3D $(am__append_16) includesystooldir =3D $(tooldir)/include/sys @@ -905,7 +913,7 @@ AM_CPPFLAGS =3D -idirafter $(srcroot)/include # to install (e.g. our crt0.o objects). noinst_LIBRARIES =3D libobjs.a libobjs_a_SOURCES =3D $(am__append_14) $(am__append_19) $(am__append_25) \ - $(am__append_31) + $(am__append_31) $(am__append_40) FLAGS_TO_PASS =3D \ "CC=3D$(CC)" \ "CFLAGS=3D$(CFLAGS)" \ @@ -1191,19 +1199,19 @@ TEXINFO_TEX =3D ../texinfo/texinfo.tex @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libgloss_a_SOURCES = =3D 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_44) \ -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_48) -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_qemu_a_CPPFL= AGS =3D -DQEMU_SEMIHOSTING \ @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_45) \ @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_49) +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_qemu_a_CPPFL= AGS =3D -DQEMU_SEMIHOSTING \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_46) \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_50) @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_qemu_a_SOURC= ES =3D \ @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 =20 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_openocd_a_CP= PFLAGS =3D -DOPENOCD_SEMIHOSTING \ -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_46) \ -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_50) +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_47) \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_51) @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_openocd_a_SO= URCES =3D \ @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/syscalls.c =20 @@ -1699,6 +1707,18 @@ lm32/$(DEPDIR)/$(am__dirstamp): @: > lm32/$(DEPDIR)/$(am__dirstamp) lm32/crt0.$(OBJEXT): lm32/$(am__dirstamp) \ lm32/$(DEPDIR)/$(am__dirstamp) +xtensa/$(am__dirstamp): + @$(MKDIR_P) xtensa + @: > xtensa/$(am__dirstamp) +xtensa/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) xtensa/$(DEPDIR) + @: > xtensa/$(DEPDIR)/$(am__dirstamp) +xtensa/crt0.$(OBJEXT): xtensa/$(am__dirstamp) \ + xtensa/$(DEPDIR)/$(am__dirstamp) +xtensa/crt1-sim.$(OBJEXT): xtensa/$(am__dirstamp) \ + xtensa/$(DEPDIR)/$(am__dirstamp) +xtensa/crt1-boards.$(OBJEXT): xtensa/$(am__dirstamp) \ + xtensa/$(DEPDIR)/$(am__dirstamp) =20 libobjs.a: $(libobjs_a_OBJECTS) $(libobjs_a_DEPENDENCIES) $(EXTRA_libobjs_= a_DEPENDENCIES)=20 $(AM_V_at)-rm -f libobjs.a @@ -1965,12 +1985,6 @@ riscv/libsim.a: $(riscv_libsim_a_OBJECTS) $(riscv_li= bsim_a_DEPENDENCIES) $(EXTRA $(AM_V_at)-rm -f riscv/libsim.a $(AM_V_AR)$(riscv_libsim_a_AR) riscv/libsim.a $(riscv_libsim_a_OBJECTS) $= (riscv_libsim_a_LIBADD) $(AM_V_at)$(RANLIB) riscv/libsim.a -xtensa/$(am__dirstamp): - @$(MKDIR_P) xtensa - @: > xtensa/$(am__dirstamp) -xtensa/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) xtensa/$(DEPDIR) - @: > xtensa/$(DEPDIR)/$(am__dirstamp) xtensa/xtensa_libgloss_a-sleep.$(OBJEXT): xtensa/$(am__dirstamp) \ xtensa/$(DEPDIR)/$(am__dirstamp) xtensa/xtensa_libgloss_a-syscalls.$(OBJEXT): xtensa/$(am__dirstamp) \ @@ -2331,6 +2345,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@riscv/$(DEPDIR)/riscv_libsim_a-sys_ut= ime.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@riscv/$(DEPDIR)/riscv_libsim_a-sys_wa= it.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@riscv/$(DEPDIR)/riscv_libsim_a-sys_wr= ite.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@xtensa/$(DEPDIR)/crt0.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@xtensa/$(DEPDIR)/crt1-boards.Po@am__q= uote@ +@AMDEP_TRUE@@am__include@ @am__quote@xtensa/$(DEPDIR)/crt1-sim.Po@am__quot= e@ @AMDEP_TRUE@@am__include@ @am__quote@xtensa/$(DEPDIR)/xtensa_libgloss_a-sl= eep.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@xtensa/$(DEPDIR)/xtensa_libgloss_a-sy= scalls.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@xtensa/$(DEPDIR)/xtensa_libgloss_a-wi= ndow-vectors.Po@am__quote@ @@ -5403,9 +5420,6 @@ maintainer-clean-local: maintainer-clean-multi @CONFIG_BFIN_TRUE@bfin/basiccrt60xc1.$(OBJEXT): bfin/basiccrt.S @CONFIG_BFIN_TRUE@ $(AM_V_CPPAS)$(CPPASCOMPILE) $(bfin_CPPFLAGS) -o $@ -c = $< $(if $(findstring mcpu=3D,$(CFLAGS)),-mcpu=3Dbf608-any,-mcpu=3Dbf608-non= e) -D__ADSPBF60x_CORE1__ =20 -@CONFIG_XTENSA_TRUE@xtensa/crt0.$(OBJEXT): xtensa/crt0.S -@CONFIG_XTENSA_TRUE@ $(AM_V_CPPAS)$(CPPASCOMPILE) $(CPPFLAGS) -o $@ -c $< - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/libgloss/xtensa/Makefile.inc b/libgloss/xtensa/Makefile.inc index 02308e4f3..3ce02c190 100644 --- a/libgloss/xtensa/Makefile.inc +++ b/libgloss/xtensa/Makefile.inc @@ -8,6 +8,10 @@ multilibtool_DATA +=3D \ %D%/sys.qemu.specs \ %D%/sys.openocd.specs \ %D%/crt0.o +libobjs_a_SOURCES +=3D \ + %D%/crt0.S \ + %D%/crt1-sim.S \ + %D%/crt1-boards.S =20 multilibtool_LIBRARIES +=3D %D%/libgloss.a =20 @@ -50,6 +54,3 @@ multilibtool_DATA +=3D %D%/boards/esp32s3/memory.elf.ld %C%_libsys_openocd_a_CPPFLAGS +=3D -I$(srcdir)/%D%/boards/esp32s3/include endif endif - -%D%/crt0.$(OBJEXT): %D%/crt0.S - $(AM_V_CPPAS)$(CPPASCOMPILE) $(CPPFLAGS) -o $@ -c $<