public inbox for newlib-cvs@sourceware.org help / color / mirror / Atom feed
From: Jeff Johnston <jjohnstn@sourceware.org> To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Revert "Fix libgloss/newlib build to conditionally use top include dir" Date: Tue, 19 Dec 2023 18:55:39 +0000 (GMT) [thread overview] Message-ID: <20231219185539.DB07A3858435@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=b67114d7d826194d20a002869ac3f2ef2db47b8f commit b67114d7d826194d20a002869ac3f2ef2db47b8f Author: Mike Frysinger <vapier@gentoo.org> Date: Mon Dec 4 02:03:06 2023 -0500 Revert "Fix libgloss/newlib build to conditionally use top include dir" This reverts commit 17ac400c11bab30ac2c0bef12cbf7788f0b6f954. 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 = includesystooldir = $(tooldir)/include/sys includesystool_DATA = -if NEED_TOP_INCLUDE_DIR AM_CPPFLAGS = -idirafter $(srcroot)/include -else -AM_CPPFLAGS = -endif # 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 = `if [ -d ${objroot}/newlib ]; then echo -I${objroot}/newlib/targ-include -I${srcroot}/newlib/libc/include; fi` -NEWLIB_LDFLAGS = `if [ -d ${objroot}/newlib ]; then echo -B${objroot}/newlib/ -L${objroot}/newlib/; fi` - -INCLUDES = -I. -I$(srcdir)/.. -I$(objdir)/.. -idirafter $(srcroot)/include -# Note that when building the library, ${MULTILIB} is not the way multilib -# options are passed; they're passed in $(CFLAGS). -CFLAGS_FOR_TARGET = -O2 -g ${MULTILIB} ${INCLUDES} ${NEWLIB_CFLAGS} -LDFLAGS_FOR_TARGET = ${MULTILIB} ${NEWLIB_LDFLAGS} -AR_FLAGS = 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 install-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 = `if [ -d ${objroot}/newlib ]; then echo -I${objroot}/newlib/targ-include -I${srcroot}/newlib/libc/include; fi` NEWLIB_LDFLAGS = `if [ -d ${objroot}/newlib ]; then echo -B${objroot}/newlib/ -L${objroot}/newlib/; fi` -INCLUDES = -I. -I$(srcdir)/.. -I$(objdir)/.. +INCLUDES = -I. -I$(srcdir)/.. -I$(objdir)/.. -idirafter $(srcroot)/include # Note that when building the library, ${MULTILIB} is not the way multilib # options are passed; they're passed in $(CFLAGS). CFLAGS_FOR_TARGET = -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=true - host_makefile_frag=${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 = xtrue) ]) -dnl arm platforms have a special header file found in the main include directory -AM_CONDITIONAL([NEED_TOP_INCLUDE_DIR], [[test x$config_arm] = xtrue]) - dnl For now, don't bother configuring testsuite dnl dnl if test "${config_testsuite}" = "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 = $(tooldir)/lib$(MULTISUBDIR) # These are useful for standalone object files like crt0.o. AM_CFLAGS = $(AM_CFLAGS_$(subst /,_,$(@D))) $(AM_CFLAGS_$(subst /,_,$(@D)_$(<F))) AM_CCASFLAGS = $(AM_CCASFLAGS_$(subst /,_,$(@D))) $(AM_CCASFLAGS_$(subst /,_,$(@D)_$(<F))) -if HAVE_LIBC_MACHINE_ARM AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS) $(AM_CPPFLAGS_$(subst /,_,$(@D))) $(AM_CPPFLAGS_$(subst /,_,$(@D)_$(<F))) -idirafter $(srcroot)/include -else -AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS) $(AM_CPPFLAGS_$(subst /,_,$(@D))) $(AM_CPPFLAGS_$(subst /,_,$(@D)_$(<F))) -endif toollib_LIBRARIES = libm.a \ libc.a
reply other threads:[~2023-12-19 18:55 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20231219185539.DB07A3858435@sourceware.org \ --to=jjohnstn@sourceware.org \ --cc=newlib-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).