From b67114d7d826194d20a002869ac3f2ef2db47b8f Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 4 Dec 2023 02:03:06 -0500
Subject: 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.
---
 newlib/Makefile.am | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'newlib/Makefile.am')

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
-- 
cgit v1.2.3