From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2134) id DB07A3858435; Tue, 19 Dec 2023 18:55:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DB07A3858435 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1703012139; bh=9HtD/3cDljd84fulO9tAbNCQ0hZ7ZbZJCK5v4YC30qc=; h=From:To:Subject:Date:From; b=xZCG8lvgg+mzmRv2b3qkaZ1viPn5X0ft40S7rZzgmbZKqR8Ab5jafkEjSvodd3zaD PUKhhfR9OR5zpZiruPl+aoAi3nZZiy/2oX+mIOiF46NSHUpEMiAAzXmo5o9STrcY++ U+x67P/eXvTjV+GeWkNrH+dOnLqn/UEMzdM8OT+E= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Jeff Johnston To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Revert "Fix libgloss/newlib build to conditionally use top include dir" X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 60c6397133b741a532579670929dbf47e25fbd31 X-Git-Newrev: b67114d7d826194d20a002869ac3f2ef2db47b8f Message-Id: <20231219185539.DB07A3858435@sourceware.org> Date: Tue, 19 Dec 2023 18:55:39 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Db67114d7d82= 6194d20a002869ac3f2ef2db47b8f commit b67114d7d826194d20a002869ac3f2ef2db47b8f Author: Mike Frysinger Date: Mon Dec 4 02:03:06 2023 -0500 Revert "Fix libgloss/newlib build to conditionally use top include dir" =20 This reverts commit 17ac400c11bab30ac2c0bef12cbf7788f0b6f954. =20 The build failures were due to incorrectly using $(INCLUDES) when running $(AS). Let's roll this back and drop $(INCLUDES) from the $(AS) invocations. Diff: --- libgloss/Makefile.am | 4 ---- libgloss/config/arm.mh | 34 ---------------------------------- libgloss/config/default.mh | 2 +- libgloss/configure.ac | 4 ---- newlib/Makefile.am | 4 ---- 5 files changed, 1 insertion(+), 47 deletions(-) diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am index f440ad23a..0d4460b58 100644 --- a/libgloss/Makefile.am +++ b/libgloss/Makefile.am @@ -24,11 +24,7 @@ includetool_DATA =3D includesystooldir =3D $(tooldir)/include/sys includesystool_DATA =3D =20 -if NEED_TOP_INCLUDE_DIR AM_CPPFLAGS =3D -idirafter $(srcroot)/include -else -AM_CPPFLAGS =3D -endif =20 # A fake library so automake will generate rules for plain objects that we= want # to install (e.g. our crt0.o objects). diff --git a/libgloss/config/arm.mh b/libgloss/config/arm.mh deleted file mode 100644 index 81f0920f9..000000000 --- a/libgloss/config/arm.mh +++ /dev/null @@ -1,34 +0,0 @@ -NEWLIB_CFLAGS =3D `if [ -d ${objroot}/newlib ]; then echo -I${objroot}/new= lib/targ-include -I${srcroot}/newlib/libc/include; fi` -NEWLIB_LDFLAGS =3D `if [ -d ${objroot}/newlib ]; then echo -B${objroot}/ne= wlib/ -L${objroot}/newlib/; fi` - -INCLUDES =3D -I. -I$(srcdir)/.. -I$(objdir)/.. -idirafter $(srcroot)/inclu= de -# Note that when building the library, ${MULTILIB} is not the way multilib -# options are passed; they're passed in $(CFLAGS). -CFLAGS_FOR_TARGET =3D -O2 -g ${MULTILIB} ${INCLUDES} ${NEWLIB_CFLAGS} -LDFLAGS_FOR_TARGET =3D ${MULTILIB} ${NEWLIB_LDFLAGS} -AR_FLAGS =3D rc - -.c.o: - $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $< - -.C.o: - $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $< -.s.o: - $(AS) $(ASFLAGS_FOR_TARGET) $(INCLUDES) $(ASFLAGS) -o $*.o $< - -# -# GCC knows to run the preprocessor on .S files before it assembles them. -# -.S.o: - $(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) $(CFLAGS) -c $< - -# -# this is a bogus target that'll produce an assembler from the -# C source with the right compiler options. this is so we can -# track down code generation or debug symbol bugs. -# -.c.s: - $(CC) $(CFLAGS_FOR_TARGET) -S $(INCLUDES) $(CFLAGS) $< - -# We don't build docs in subdirs, so stub out the rules. -.PHONY: doc docs dvi html install-html info install-info clean-info pdf in= stall-pdf diff --git a/libgloss/config/default.mh b/libgloss/config/default.mh index 4e7f106f9..81f0920f9 100644 --- a/libgloss/config/default.mh +++ b/libgloss/config/default.mh @@ -1,7 +1,7 @@ NEWLIB_CFLAGS =3D `if [ -d ${objroot}/newlib ]; then echo -I${objroot}/new= lib/targ-include -I${srcroot}/newlib/libc/include; fi` NEWLIB_LDFLAGS =3D `if [ -d ${objroot}/newlib ]; then echo -B${objroot}/ne= wlib/ -L${objroot}/newlib/; fi` =20 -INCLUDES =3D -I. -I$(srcdir)/.. -I$(objdir)/.. +INCLUDES =3D -I. -I$(srcdir)/.. -I$(objdir)/.. -idirafter $(srcroot)/inclu= de # Note that when building the library, ${MULTILIB} is not the way multilib # options are passed; they're passed in $(CFLAGS). CFLAGS_FOR_TARGET =3D -O2 -g ${MULTILIB} ${INCLUDES} ${NEWLIB_CFLAGS} diff --git a/libgloss/configure.ac b/libgloss/configure.ac index 47854eab3..19bdf9b3a 100644 --- a/libgloss/configure.ac +++ b/libgloss/configure.ac @@ -217,7 +217,6 @@ case "${target}" in ;; arm*-*-elf | arm*-*-coff | arm*-*-*) config_arm=3Dtrue - host_makefile_frag=3D${srcdir}/config/arm.mh ;; spu-*-elf) AC_CONFIG_FILES([spu/Makefile]) @@ -256,9 +255,6 @@ m4_foreach_w([SUBDIR], [ AM_CONDITIONAL([CONFIG_]m4_toupper(SUBDIR), [test x$config_]SUBDIR =3D x= true) ]) =20 -dnl arm platforms have a special header file found in the main include dir= ectory -AM_CONDITIONAL([NEED_TOP_INCLUDE_DIR], [[test x$config_arm] =3D xtrue]) - dnl For now, don't bother configuring testsuite dnl dnl if test "${config_testsuite}" =3D "true"; diff --git a/newlib/Makefile.am b/newlib/Makefile.am index 47f0be288..4ab36b8d8 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -70,11 +70,7 @@ toollibdir =3D $(tooldir)/lib$(MULTISUBDIR) # These are useful for standalone object files like crt0.o. AM_CFLAGS =3D $(AM_CFLAGS_$(subst /,_,$(@D))) $(AM_CFLAGS_$(subst /,_,$(@D= )_$(