libgloss: arm: break newlib dependency

The libgloss port has been reaching back into newlib internals for a
single header whose contents have been frozen for almost a decade.
To break this backwards libgloss->newlib dependency, move the acle
header to the srcroot include/ so everyone can use the same copy.

5 files changed, 7 insertions, 4 deletions

diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am
index 5b5f0fd54..18b32fad2 100644
--- a/libgloss/Makefile.am
+++ b/libgloss/Makefile.am
@@ -11,6 +11,7 @@ PHONY =
 
 SUBDIRS = @subdirs@ .
 
+srcroot = $(top_srcdir)/..
 tooldir = $(exec_prefix)/$(target_alias)
 
 multilibtooldir = $(tooldir)/lib$(MULTISUBDIR)
@@ -23,6 +24,8 @@ includetool_DATA =
 includesystooldir = $(tooldir)/include/sys
 includesystool_DATA =
 
+AM_CPPFLAGS = -idirafter $(srcroot)/include
+
 # A fake library so automake will generate rules for plain objects that we want
 # to install (e.g. our crt0.o objects).
 noinst_LIBRARIES = libobjs.a
diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in
index cd60857d1..77bb9b027 100644
--- a/libgloss/Makefile.in
+++ b/libgloss/Makefile.in
@@ -657,6 +657,7 @@ info_TEXINFOS = $(am__append_1)
 CLEANFILES = $(am__append_4)
 PHONY = 
 SUBDIRS = @subdirs@ .
+srcroot = $(top_srcdir)/..
 tooldir = $(exec_prefix)/$(target_alias)
 multilibtooldir = $(tooldir)/lib$(MULTISUBDIR)
 multilibtool_DATA = $(am__append_3) $(am__append_7) $(am__append_9) \
@@ -669,6 +670,7 @@ includetooldir = $(tooldir)/include
 includetool_DATA = $(am__append_10)
 includesystooldir = $(tooldir)/include/sys
 includesystool_DATA = $(am__append_11)
+AM_CPPFLAGS = -idirafter $(srcroot)/include
 
 # 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/arm/Makefile.in b/libgloss/arm/Makefile.in
index 06fae10c1..d0d5ea89d 100644
--- a/libgloss/arm/Makefile.in
+++ b/libgloss/arm/Makefile.in
@@ -97,8 +97,6 @@ IQ80310_INSTALL	= install-iq80310
 # Host specific makefile fragment comes in here.
 @host_makefile_frag@
 
-INCLUDES += `if [ -d ${objroot}/newlib ]; then echo -I$(srcroot)/newlib/libc/machine/arm; fi`
-
 #
 # build a test program for each target board. Just trying to get
 # it to link is a good test, so we ignore all the errors for now.
diff --git a/libgloss/arm/arm.h b/libgloss/arm/arm.h
index 10e5b0509..f3cd49308 100644
--- a/libgloss/arm/arm.h
+++ b/libgloss/arm/arm.h
@@ -29,7 +29,7 @@
 #ifndef _LIBGLOSS_ARM_H
 #define _LIBGLOSS_ARM_H
 
-#include "acle-compat.h"
+#include "arm-acle-compat.h"
 
 /* Checking for targets supporting only Thumb instructions (eg. ARMv6-M) or
    supporting Thumb-2 instructions, whether ARM instructions are available or
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}