From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 1A2CF385841D; Tue, 2 Jan 2024 04:37:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1A2CF385841D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1704170274; bh=ITLCBcovD/dV6yH5B6H2pNNmo9BQODSqzC4zkSiF+g4=; h=From:To:Subject:Date:From; b=shte07KMba+F7vOrI+HHN2SARUTfMmzcqzYR9xPOZxvz+whP3ynruRMS8z/HnUdHf 7JV5LKs/Hutgao3t8TwY9dx2cRvIwwUFWzG3YwJ/YP2cwTBQAlKe2uIa96qL2FeflI VRBcPkhpbccBvxRbdkzQ0jCUXTkTUUfZO2SBK+og= 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/users/vapier/wip] libgloss: xtensa: fix CPPFLAGS clobbering X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/users/vapier/wip X-Git-Oldrev: 9b1d4a2c83719b83724798881d4edb074fd8aafa X-Git-Newrev: b9dc98d3f4f16796e759dab95f210a3d2693abe7 Message-Id: <20240102043754.1A2CF385841D@sourceware.org> Date: Tue, 2 Jan 2024 04:37:54 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Db9dc98d3f4f= 16796e759dab95f210a3d2693abe7 commit b9dc98d3f4f16796e759dab95f210a3d2693abe7 Author: Mike Frysinger Date: Wed Dec 27 02:42:30 2023 -0500 libgloss: xtensa: fix CPPFLAGS clobbering =20 No sub-Makefile.inc file should ever set CPPFLAGS directly. That is a global/common variable. Instead, ports should set the per-target CPPFLAGS to include what they need. =20 Further, per-target CPPFLAGS should respect $(AM_CPPFLAGS). Diff: --- libgloss/Makefile.in | 45 ++++++++++++++++++++++++----------------= ---- libgloss/xtensa/Makefile.inc | 15 ++++++++++----- 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in index 6fa581eea..e820647e3 100644 --- a/libgloss/Makefile.in +++ b/libgloss/Makefile.in @@ -318,8 +318,7 @@ multilibtool_PROGRAMS =3D $(am__EXEEXT_6) @CONFIG_XSTORMY16_TRUE@ xstormy16/libeva_app.a @CONFIG_XSTORMY16_TRUE@am__append_92 =3D xstormy16/eva_stub.elf @CONFIG_XSTORMY16_TRUE@am__append_93 =3D xstormy16/eva_stub.hex -@CONFIG_XTENSA_TRUE@am__append_94 =3D -D_LIBGLOSS -I$(srcdir)/xtensa/inclu= de -@CONFIG_XTENSA_TRUE@am__append_95 =3D \ +@CONFIG_XTENSA_TRUE@am__append_94 =3D \ @CONFIG_XTENSA_TRUE@ xtensa/default.specs \ @CONFIG_XTENSA_TRUE@ xtensa/nano.specs \ @CONFIG_XTENSA_TRUE@ xtensa/sim.elf.specs \ @@ -328,27 +327,29 @@ multilibtool_PROGRAMS =3D $(am__EXEEXT_6) @CONFIG_XTENSA_TRUE@ xtensa/sys.openocd.specs \ @CONFIG_XTENSA_TRUE@ xtensa/crt0.o =20 -@CONFIG_XTENSA_TRUE@am__append_96 =3D \ +@CONFIG_XTENSA_TRUE@am__append_95 =3D \ @CONFIG_XTENSA_TRUE@ xtensa/crt0.S \ @CONFIG_XTENSA_TRUE@ xtensa/crt1-sim.S \ @CONFIG_XTENSA_TRUE@ xtensa/crt1-boards.S =20 -@CONFIG_XTENSA_TRUE@am__append_97 =3D xtensa/libgloss.a -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_98 =3D \ +@CONFIG_XTENSA_TRUE@am__append_96 =3D xtensa/libgloss.a +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_97 =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_99 =3D xtensa/l= ibsys_qemu.a \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_98 =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_100 =3D xtensa/boards/esp32/memory.elf.ld -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_T= RUE@am__append_101 =3D xtensa/boards/esp32/board.c +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_T= RUE@am__append_99 =3D xtensa/boards/esp32/memory.elf.ld +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_T= RUE@am__append_100 =3D xtensa/boards/esp32/board.c +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_T= RUE@am__append_101 =3D -I$(srcdir)/xtensa/boards/esp32/include @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_T= RUE@am__append_102 =3D -I$(srcdir)/xtensa/boards/esp32/include @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_T= RUE@am__append_103 =3D -I$(srcdir)/xtensa/boards/esp32/include @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP= _TRUE@am__append_104 =3D xtensa/boards/esp32s3/memory.elf.ld @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP= _TRUE@am__append_105 =3D xtensa/boards/esp32s3/board.c @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP= _TRUE@am__append_106 =3D -I$(srcdir)/xtensa/boards/esp32s3/include @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP= _TRUE@am__append_107 =3D -I$(srcdir)/xtensa/boards/esp32s3/include +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP= _TRUE@am__append_108 =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 \ @@ -1284,7 +1285,7 @@ CCASFLAGS =3D @CCASFLAGS@ CCDEPMODE =3D @CCDEPMODE@ CFLAGS =3D @CFLAGS@ CPP =3D @CPP@ -CPPFLAGS =3D @CPPFLAGS@ $(am__append_94) +CPPFLAGS =3D @CPPFLAGS@ CYGPATH_W =3D @CYGPATH_W@ DEFS =3D @DEFS@ DEPDIR =3D @DEPDIR@ @@ -1409,8 +1410,8 @@ multilibtool_DATA =3D $(am__append_3) $(am__append_6)= $(am__append_7) \ $(am__append_62) $(am__append_65) $(am__append_68) \ $(am__append_71) $(am__append_73) $(am__append_75) \ $(am__append_78) $(am__append_81) $(am__append_84) \ - $(am__append_89) $(am__append_95) $(am__append_98) \ - $(am__append_100) $(am__append_104) + $(am__append_89) $(am__append_94) $(am__append_97) \ + $(am__append_99) $(am__append_104) multilibtool_LIBRARIES =3D $(am__append_2) $(am__append_5) \ $(am__append_9) $(am__append_11) $(am__append_20) \ $(am__append_21) $(am__append_25) $(am__append_28) \ @@ -1420,7 +1421,7 @@ multilibtool_LIBRARIES =3D $(am__append_2) $(am__appe= nd_5) \ $(am__append_64) $(am__append_67) $(am__append_70) \ $(am__append_72) $(am__append_74) $(am__append_77) \ $(am__append_80) $(am__append_83) $(am__append_86) \ - $(am__append_91) $(am__append_97) $(am__append_99) + $(am__append_91) $(am__append_96) $(am__append_98) includetooldir =3D $(tooldir)/include includetool_DATA =3D $(am__append_16) includesystooldir =3D $(tooldir)/include/sys @@ -1441,7 +1442,7 @@ libobjs_a_SOURCES =3D $(am__append_14) $(am__append_1= 9) $(am__append_24) \ $(am__append_51) $(am__append_57) $(am__append_63) \ $(am__append_66) $(am__append_69) $(am__append_76) \ $(am__append_79) $(am__append_82) $(am__append_85) \ - $(am__append_90) $(am__append_96) + $(am__append_90) $(am__append_95) FLAGS_TO_PASS =3D \ "CC=3D$(CC)" \ "CFLAGS=3D$(CFLAGS)" \ @@ -2097,27 +2098,31 @@ TEXINFO_TEX =3D ../texinfo/texinfo.tex @CONFIG_XSTORMY16_TRUE@ $(AM_LDFLAGS) \ @CONFIG_XSTORMY16_TRUE@ -nostartfiles -T$(srcdir)/xstormy16/eva_stub.ld =20 +@CONFIG_XTENSA_TRUE@AM_CPPFLAGS_xtensa =3D -D_LIBGLOSS -I$(srcdir)/xtensa/= include @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_101) \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_100) \ @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_105) -@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_102) \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libgloss_a_CPPFLAGS= =3D $(AM_CPPFLAGS) \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_101) \ @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_106) +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_qemu_a_CPPFL= AGS =3D $(AM_CPPFLAGS) \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ -DQEMU_SEMIHOSTING \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_102) \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_107) @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@xtensa_libsys_openocd_a_CP= PFLAGS =3D $(AM_CPPFLAGS) \ +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ -DOPENOCD_SEMIHOSTING \ @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_103) \ -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_107) +@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_108) @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 -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP= _TRUE@xtensa_libgloss_a_CPPFLAGS =3D -I$(srcdir)/xtensa/boards/esp32s3/incl= ude -@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_T= RUE@xtensa_libgloss_a_CPPFLAGS =3D -I$(srcdir)/xtensa/boards/esp32/include all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive =20 diff --git a/libgloss/xtensa/Makefile.inc b/libgloss/xtensa/Makefile.inc index 3ce02c190..b4c818732 100644 --- a/libgloss/xtensa/Makefile.inc +++ b/libgloss/xtensa/Makefile.inc @@ -1,4 +1,4 @@ -CPPFLAGS +=3D -D_LIBGLOSS -I$(srcdir)/%D%/include +AM_CPPFLAGS_%C% =3D -D_LIBGLOSS -I$(srcdir)/%D%/include =20 multilibtool_DATA +=3D \ %D%/default.specs \ @@ -25,23 +25,28 @@ multilibtool_DATA +=3D \ %D%/sleep.S \ %D%/syscalls.c \ %D%/window-vectors.S +%C%_libgloss_a_CPPFLAGS =3D $(AM_CPPFLAGS) =20 multilibtool_LIBRARIES +=3D %D%/libsys_qemu.a -%C%_libsys_qemu_a_CPPFLAGS =3D -DQEMU_SEMIHOSTING +%C%_libsys_qemu_a_CPPFLAGS =3D \ + $(AM_CPPFLAGS) \ + -DQEMU_SEMIHOSTING %C%_libsys_qemu_a_SOURCES =3D \ %D%/sim-vectors.S \ %D%/sim-call.S \ %D%/syscalls.c =20 multilibtool_LIBRARIES +=3D %D%/libsys_openocd.a -%C%_libsys_openocd_a_CPPFLAGS =3D -DOPENOCD_SEMIHOSTING +%C%_libsys_openocd_a_CPPFLAGS =3D \ + $(AM_CPPFLAGS) \ + -DOPENOCD_SEMIHOSTING %C%_libsys_openocd_a_SOURCES =3D \ %D%/syscalls.c =20 if HAVE_XTENSA_BOARD_ESP32 multilibtool_DATA +=3D %D%/boards/esp32/memory.elf.ld %C%_libgloss_a_SOURCES +=3D %D%/boards/esp32/board.c -%C%_libgloss_a_CPPFLAGS =3D -I$(srcdir)/%D%/boards/esp32/include +%C%_libgloss_a_CPPFLAGS +=3D -I$(srcdir)/%D%/boards/esp32/include %C%_libsys_qemu_a_CPPFLAGS +=3D -I$(srcdir)/%D%/boards/esp32/include %C%_libsys_openocd_a_CPPFLAGS +=3D -I$(srcdir)/%D%/boards/esp32/include endif @@ -49,7 +54,7 @@ endif if HAVE_XTENSA_BOARD_ESP32S3 multilibtool_DATA +=3D %D%/boards/esp32s3/memory.elf.ld %C%_libgloss_a_SOURCES +=3D %D%/boards/esp32s3/board.c -%C%_libgloss_a_CPPFLAGS =3D -I$(srcdir)/%D%/boards/esp32s3/include +%C%_libgloss_a_CPPFLAGS +=3D -I$(srcdir)/%D%/boards/esp32s3/include %C%_libsys_qemu_a_CPPFLAGS +=3D -I$(srcdir)/%D%/boards/esp32s3/include %C%_libsys_openocd_a_CPPFLAGS +=3D -I$(srcdir)/%D%/boards/esp32s3/include endif