From 3ae0c9a36154b9e079f83aed30c9878d8fa8b9ea Mon Sep 17 00:00:00 2001 From: Wolfgang Wiedmeyer Date: Fri, 9 Dec 2016 01:50:22 +0100 Subject: Remove inline redeclaration of libc_name_p MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit prevents build error with recent gcc: In file included from .././../../../../../src/gcc/gcc-4.9/gcc/cp/except.c:1013:0: cfns.gperf: In function ‘const char* libc_name_p(const char*, unsigned int)’: cfns.gperf:101:1: error: ‘const char* libc_name_p(const char*, unsigned int)’ redeclared inline with ‘gnu_inline’ attribute cfns.gperf:26:14: note: ‘const char* libc_name_p(const char*, unsigned int)’ previously declared here cfns.gperf: At global scope: cfns.gperf:26:14: warning: inline function ‘const char* libc_name_p(const char*, unsigned int)’ used but never defined Change-Id: I5130fc219d5fa39913ffa18a33185dcb64508dd3 Signed-off-by: Wolfgang Wiedmeyer --- gcc-4.9/gcc/cp/cfns.gperf | 4 ---- gcc-4.9/gcc/cp/cfns.h | 4 ---- 2 files changed, 8 deletions(-) (limited to 'gcc-4.9') diff --git a/gcc-4.9/gcc/cp/cfns.gperf b/gcc-4.9/gcc/cp/cfns.gperf index 05ca75392..b3c1ac7b7 100644 --- a/gcc-4.9/gcc/cp/cfns.gperf +++ b/gcc-4.9/gcc/cp/cfns.gperf @@ -20,10 +20,6 @@ along with GCC; see the file COPYING3. If not see __inline #endif static unsigned int hash (const char *, unsigned int); -#ifdef __GNUC__ -__inline -#endif -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-4.9/gcc/cp/cfns.h b/gcc-4.9/gcc/cp/cfns.h index c845ddf08..6c9c8c44f 100644 --- a/gcc-4.9/gcc/cp/cfns.h +++ b/gcc-4.9/gcc/cp/cfns.h @@ -51,10 +51,6 @@ along with GCC; see the file COPYING3. If not see __inline #endif static unsigned int hash (const char *, unsigned int); -#ifdef __GNUC__ -__inline -#endif -const char * libc_name_p (const char *, unsigned int); /* maximum key range = 391, duplicates = 0 */ #ifdef __GNUC__ -- cgit v1.2.3