diff --git a/gcc/gcc/cp/cfns.gperf b/gcc/gcc/cp/cfns.gperf
index 68acd3df48..b40e21561e 100644
--- a/gcc/gcc/cp/cfns.gperf
+++ b/gcc/gcc/cp/cfns.gperf
@@ -20,10 +20,10 @@ along with GCC; see the file COPYING3.  If not see
 __inline
 #endif
 static unsigned int hash (const char *, unsigned int);
-#ifdef __GNUC__
+/*#ifdef __GNUC__
 __inline
 #endif
-const char * libc_name_p (const char *, unsigned int);
+const char * libc_name_p (const char *, unsigned int);*/
 %}
 %%
 # The standard C library functions, for feeding to gperf; the result is used
diff --git a/gcc/gcc/cp/cfns.h b/gcc/gcc/cp/cfns.h
index 1c6665d4f5..882a9e2cd1 100644
--- a/gcc/gcc/cp/cfns.h
+++ b/gcc/gcc/cp/cfns.h
@@ -122,12 +122,7 @@ hash (register const char *str, register unsigned int len)
   return hval + asso_values[(unsigned char)str[len - 1]];
 }
 
-#ifdef __GNUC__
-__inline
-#ifdef __GNUC_STDC_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
+
 const char *
 libc_name_p (register const char *str, register unsigned int len)
 {