Fix inline usage.

3 files changed, 46 insertions, 1 deletions

diff --git a/cross/avr-gcc/distinfo b/cross/avr-gcc/distinfo
index 4eabb36522b..64c4c7560c5 100644
--- a/cross/avr-gcc/distinfo
+++ b/cross/avr-gcc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2010/06/20 22:20:18 tron Exp $
+$NetBSD: distinfo,v 1.6 2012/11/16 00:38:21 joerg Exp $
 
 SHA1 (gcc-core-4.4.1.tar.bz2) = 7e18b5f49b77a78e0ccd31c82c6220c5756da754
 RMD160 (gcc-core-4.4.1.tar.bz2) = 6545aea8ad1c9ae55cb0f12991456a0dd3bc490d
@@ -9,3 +9,5 @@ Size (gcc-g++-4.4.1.tar.bz2) = 5936040 bytes
 SHA1 (patch-aa) = 17ee1942842186c4336d72bb8223bdb3023c85c1
 SHA1 (patch-ab) = 4a3ab9719a6714933954a120ad8c594c3a4a2e1f
 SHA1 (patch-ac) = 14dbe72be88bd6fb0fd8671494454a6d4c11c4b7
+SHA1 (patch-gcc_cp_cfns.h) = cf57820c0ae992b30cb4f2be85521ea1fcf735d5
+SHA1 (patch-gcc_toplev.h) = 4378a41650336b91b376fcf158570290e1ef3714
diff --git a/cross/avr-gcc/patches/patch-gcc_cp_cfns.h b/cross/avr-gcc/patches/patch-gcc_cp_cfns.h
new file mode 100644
index 00000000000..d960d3ecd50
--- /dev/null
+++ b/cross/avr-gcc/patches/patch-gcc_cp_cfns.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-gcc_cp_cfns.h,v 1.1 2012/11/16 00:38:21 joerg Exp $
+
+--- gcc/cp/cfns.h.orig	2012-11-14 17:13:55.000000000 +0000
++++ gcc/cp/cfns.h
+@@ -35,13 +35,13 @@ __inline
+ #endif
+ static unsigned int hash (const char *, unsigned int);
+ #ifdef __GNUC__
+-__inline
++static __inline
+ #endif
+ const char * libc_name_p (const char *, unsigned int);
+ /* maximum key range = 391, duplicates = 0 */
+ 
+ #ifdef __GNUC__
+-__inline
++static __inline
+ #else
+ #ifdef __cplusplus
+ inline
diff --git a/cross/avr-gcc/patches/patch-gcc_toplev.h b/cross/avr-gcc/patches/patch-gcc_toplev.h
new file mode 100644
index 00000000000..c3cd951ccaa
--- /dev/null
+++ b/cross/avr-gcc/patches/patch-gcc_toplev.h
@@ -0,0 +1,23 @@
+$NetBSD: patch-gcc_toplev.h,v 1.1 2012/11/16 00:38:21 joerg Exp $
+
+--- gcc/toplev.h.orig	2012-11-14 17:06:44.000000000 +0000
++++ gcc/toplev.h
+@@ -185,18 +185,6 @@ extern int floor_log2                  (
+ #  define CLZ_HWI __builtin_clz
+ #  define CTZ_HWI __builtin_ctz
+ # endif
+-
+-extern 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
+-exact_log2 (unsigned HOST_WIDE_INT x)
+-{
+-  return x == (x & -x) && x ? (int) CTZ_HWI (x) : -1;
+-}
+ #endif /* GCC_VERSION >= 3004 */
+ 
+ /* Functions used to get and set GCC's notion of in what directory