浏览代码

fix gcc-5.* build with a recent gcc

https://gcc.gnu.org/ml/gcc-patches/2016-01/msg00044.html
Szabolcs Nagy 8 年之前
父节点
当前提交
d08c2e8e02
共有 2 个文件被更改,包括 48 次插入0 次删除
  1. 24 0
      patches/gcc-5.2.0/0010-cfns-inline-fix.diff
  2. 24 0
      patches/gcc-5.3.0/0010-cfns-inline-fix.diff

+ 24 - 0
patches/gcc-5.2.0/0010-cfns-inline-fix.diff

@@ -0,0 +1,24 @@
+diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h
+index 1c6665d..69699c4 100644
+--- a/gcc/cp/cfns.h
++++ b/gcc/cp/cfns.h
+@@ -54,6 +54,7 @@ static unsigned int hash (const char *, unsigned int);
+ #ifdef __GNUC__
+ __inline
+ #endif
++static
+ const char * libc_name_p (const char *, unsigned int);
+ /* maximum key range = 391, duplicates = 0 */
+ 
+@@ -124,10 +125,8 @@ hash (register const char *str, register unsigned int len)
+ 
+ #ifdef __GNUC__
+ __inline
+-#ifdef __GNUC_STDC_INLINE__
+-__attribute__ ((__gnu_inline__))
+-#endif
+ #endif
++static
+ const char *
+ libc_name_p (register const char *str, register unsigned int len)
+ {

+ 24 - 0
patches/gcc-5.3.0/0010-cfns-inline-fix.diff

@@ -0,0 +1,24 @@
+diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h
+index 1c6665d..69699c4 100644
+--- a/gcc/cp/cfns.h
++++ b/gcc/cp/cfns.h
+@@ -54,6 +54,7 @@ static unsigned int hash (const char *, unsigned int);
+ #ifdef __GNUC__
+ __inline
+ #endif
++static
+ const char * libc_name_p (const char *, unsigned int);
+ /* maximum key range = 391, duplicates = 0 */
+ 
+@@ -124,10 +125,8 @@ hash (register const char *str, register unsigned int len)
+ 
+ #ifdef __GNUC__
+ __inline
+-#ifdef __GNUC_STDC_INLINE__
+-__attribute__ ((__gnu_inline__))
+-#endif
+ #endif
++static
+ const char *
+ libc_name_p (register const char *str, register unsigned int len)
+ {