aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/config/spu/spu-elf.h17
-rw-r--r--gcc/config/spu/t-spu-elf3
3 files changed, 27 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 67c796e..6c45e49 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-14 Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
+
+ * config/spu/spu-elf.h (STANDARD_STARTFILE_PREFIX_2): Disable default.
+ (STANDARD_INCLUDE_DIR): Redefine to "/include".
+ (LOCAL_INCLUDE_DIR): Undefine.
+ * config/spu/t-spu-elf (NATIVE_SYSTEM_HEADER_DIR): Define.
+
2008-11-14 Vladimir Makarov <vmakarov@redhat.com>
PR rtl-optimization/37397
diff --git a/gcc/config/spu/spu-elf.h b/gcc/config/spu/spu-elf.h
index c04f6d9..b1f8a45 100644
--- a/gcc/config/spu/spu-elf.h
+++ b/gcc/config/spu/spu-elf.h
@@ -24,6 +24,23 @@
asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN)
+/* The following macros define "native" directory locations; on the SPU,
+ these are used only when building the compiler with --with-sysroot.
+ This can be used to build a pair of PPU and SPU cross-compilers with
+ a common sysroot; the SPU compiler will search for its files in
+ ${sysroot}/include and ${sysroot}/lib. */
+
+/* STANDARD_STARTFILE_PREFIX_1 is "/lib", which we keep.
+ STANDARD_STARTFILE_PREFIX_2 is "/usr/lib" -- we remove this. */
+#undef STANDARD_STARTFILE_PREFIX_2
+#define STANDARD_STARTFILE_PREFIX_2 ""
+
+/* Use "/include" instead of "/usr/include". */
+#undef STANDARD_INCLUDE_DIR
+#define STANDARD_INCLUDE_DIR "/include"
+
+/* We do not provide any "/usr/local/include" directory on SPU. */
+#undef LOCAL_INCLUDE_DIR
/* Provide a STARTFILE_SPEC appropriate for GNU/Linux. Here we add
the GNU/Linux magical crtbegin.o file (see crtstuff.c) which
diff --git a/gcc/config/spu/t-spu-elf b/gcc/config/spu/t-spu-elf
index 017f09d..dbb1b7c 100644
--- a/gcc/config/spu/t-spu-elf
+++ b/gcc/config/spu/t-spu-elf
@@ -14,6 +14,9 @@
# along with GCC; see the file COPYING3. If not see
# <http://www.gnu.org/licenses/>.
+# Define system directory to match STANDARD_INCLUDE_DIR in spu-elf.h,
+# allowing combined SPU/PPU sysroot builds.
+NATIVE_SYSTEM_HEADER_DIR = /include
# Suppress building libgcc1.a
LIBGCC1 =