With build with clang due to overlap with system headers.

2 files changed, 22 insertions, 1 deletions

diff --git a/cross/nios2-gcc41/distinfo b/cross/nios2-gcc41/distinfo
index fd5586d367a..af6fb2bf079 100644
--- a/cross/nios2-gcc41/distinfo
+++ b/cross/nios2-gcc41/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2013/11/16 07:41:00 mef Exp $
+$NetBSD: distinfo,v 1.2 2014/09/10 12:13:06 joerg Exp $
 
 SHA1 (nios2_gnu_gcc4_13.0.gz) = 1df8e0ebd1f0e42ab4dd8a507c0a3dc85c1d598b
 RMD160 (nios2_gnu_gcc4_13.0.gz) = 5331366fc1ab307909bbe6a2ef1fc11d70b0f523
@@ -7,4 +7,5 @@ SHA1 (patch-aa) = 9fca3d2c8304c37a091200ffd7abfd4714297c45
 SHA1 (patch-gcc_config_nios2_nios2-proto.h) = 8d3006b98fe47a825c45e15e8b218f5179e8e663
 SHA1 (patch-gcc_config_nios2_nios2.c) = bc5655083a1bb641e1b606b547a27903900252fd
 SHA1 (patch-gcc_doc_invoke.texi) = 75bc85c7713d0579ec960c3f777484ca7d555214
+SHA1 (patch-gcc_toplev.h) = 912ab0e138be638983e496ff650546a35a23510e
 SHA1 (patch-libjava_classpath_script_loc) = 039d83c8dcb19f07a684edfe860ec687a50e636b
diff --git a/cross/nios2-gcc41/patches/patch-gcc_toplev.h b/cross/nios2-gcc41/patches/patch-gcc_toplev.h
new file mode 100644
index 00000000000..4b3f3802587
--- /dev/null
+++ b/cross/nios2-gcc41/patches/patch-gcc_toplev.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-gcc_toplev.h,v 1.1 2014/09/10 12:13:06 joerg Exp $
+
+--- gcc/toplev.h.orig	2013-06-13 21:33:10.000000000 +0000
++++ gcc/toplev.h
+@@ -171,13 +171,13 @@ extern int floor_log2                  (
+ #  define CTZ_HWI __builtin_ctz
+ # endif
+ 
+-extern inline int
++extern __attribute__((__gnu_inline__)) inline int
+ floor_log2 (unsigned HOST_WIDE_INT x)
+ {
+   return x ? HOST_BITS_PER_WIDE_INT - 1 - (int) CLZ_HWI (x) : -1;
+ }
+ 
+-extern inline int
++extern __attribute__((__gnu_inline__)) inline int
+ exact_log2 (unsigned HOST_WIDE_INT x)
+ {
+   return x == (x & -x) && x ? (int) CTZ_HWI (x) : -1;