From d1591ed4a11ba0b2730d6b846f0213c9a0e94b1c Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 14 Feb 2022 01:00:11 -0500 Subject: [PATCH] newlib: i386/xstormy16: drop unused -I libm/common flag These subdirs don't actually use anything from libm. The common dir in particular only has 4 header files, and none are included here. The xstormy16 code has a comment mentioning why this hack is here, but it refers to code that was removed when its configure script was merged up a level. --- newlib/libc/machine/i386/Makefile.am | 2 +- newlib/libc/machine/i386/Makefile.in | 2 +- newlib/libc/machine/xstormy16/Makefile.am | 4 +--- newlib/libc/machine/xstormy16/Makefile.in | 5 +---- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/newlib/libc/machine/i386/Makefile.am b/newlib/libc/machine/i386/Makefile.am index 28525ae57..fa1bec6ef 100644 --- a/newlib/libc/machine/i386/Makefile.am +++ b/newlib/libc/machine/i386/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to generate Makefile.in -AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(TARGET_CFLAGS) +AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS) AM_CCASFLAGS = $(AM_CPPFLAGS) diff --git a/newlib/libc/machine/i386/Makefile.in b/newlib/libc/machine/i386/Makefile.in index eb63d0177..a3423890c 100644 --- a/newlib/libc/machine/i386/Makefile.in +++ b/newlib/libc/machine/i386/Makefile.in @@ -300,7 +300,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(TARGET_CFLAGS) +AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS) AM_CCASFLAGS = $(AM_CPPFLAGS) @MACH_ADD_SETJMP_FALSE@ADDED_SOURCES = @MACH_ADD_SETJMP_TRUE@ADDED_SOURCES = setjmp.S diff --git a/newlib/libc/machine/xstormy16/Makefile.am b/newlib/libc/machine/xstormy16/Makefile.am index 877c59bf6..faaac8941 100644 --- a/newlib/libc/machine/xstormy16/Makefile.am +++ b/newlib/libc/machine/xstormy16/Makefile.am @@ -1,8 +1,6 @@ ## Process this file with automake to generate Makefile.in -# hack: putting $(abs_newlib_basedir)/libm/common into AM_CPPFLAGS forces automake -# to output a definition for newlib_basedir. -AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(TARGET_CFLAGS) +AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS) AM_CCASFLAGS = $(AM_CPPFLAGS) diff --git a/newlib/libc/machine/xstormy16/Makefile.in b/newlib/libc/machine/xstormy16/Makefile.in index 9a91d711d..0651611ff 100644 --- a/newlib/libc/machine/xstormy16/Makefile.in +++ b/newlib/libc/machine/xstormy16/Makefile.in @@ -290,10 +290,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - -# hack: putting $(abs_newlib_basedir)/libm/common into AM_CPPFLAGS forces automake -# to output a definition for newlib_basedir. -AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(TARGET_CFLAGS) +AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS) AM_CCASFLAGS = $(AM_CPPFLAGS) noinst_LIBRARIES = lib.a lib_a_SOURCES = setjmp.S -- 2.43.5