On 19.02.2016 13:26, Jakub Jelinek wrote: > On Fri, Feb 19, 2016 at 01:22:12PM +0100, Jakub Jelinek wrote: >> wants the C inline __attribute__((gnu_inline)) semantics. >> IMHO gperf should be fixed to only use __attribute__((gnu_inline)) for C++. > > For C of course. > Thus emit > #ifndef __cplusplus > #if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ > __attribute__ ((__gnu_inline__)) > #endif > #endif > or something similar. > > Jakub >
Hmm... wait a moment. How about that? Berns.
Index: gcc/cp/Make-lang.in =================================================================== --- gcc/cp/Make-lang.in (revision 233557) +++ gcc/cp/Make-lang.in (working copy) @@ -112,7 +112,7 @@ else # deleting the $(srcdir)/cp/cfns.h file. $(srcdir)/cp/cfns.h: endif - gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \ + gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L C++ \ $(srcdir)/cp/cfns.gperf --output-file $(srcdir)/cp/cfns.h # Index: gcc/cp/cfns.gperf =================================================================== --- gcc/cp/cfns.gperf (revision 233557) +++ gcc/cp/cfns.gperf (working copy) @@ -16,14 +16,7 @@ for more details. You should have received a copy of the GNU General Public License along with GCC; see the file COPYING3. If not see <http://www.gnu.org/licenses/>. */ -#ifdef __GNUC__ -__inline -#endif -static unsigned int hash (const char *, unsigned int); -#ifdef __GNUC__ -__inline -#endif -const char * libc_name_p (const char *, unsigned int); +#define libc_name_p Perfect_Hash::libc_name_p %} %% # The standard C library functions, for feeding to gperf; the result is used Index: gcc/cp/cfns.h =================================================================== --- gcc/cp/cfns.h (revision 233557) +++ gcc/cp/cfns.h (working copy) @@ -1,5 +1,5 @@ -/* ANSI-C code produced by gperf version 3.0.3 */ -/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C cfns.gperf */ +/* C++ code produced by gperf version 3.0.4 */ +/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L C++ --output-file cfns.h cfns.gperf */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ @@ -47,26 +47,20 @@ for more details. You should have received a copy of the GNU General Public License along with GCC; see the file COPYING3. If not see <http://www.gnu.org/licenses/>. */ -#ifdef __GNUC__ -__inline -#endif -static unsigned int hash (const char *, unsigned int); -#ifdef __GNUC__ -__inline -#endif -const char * libc_name_p (const char *, unsigned int); +#define libc_name_p Perfect_Hash::libc_name_p /* maximum key range = 391, duplicates = 0 */ -#ifdef __GNUC__ -__inline -#else -#ifdef __cplusplus -inline -#endif -#endif -static unsigned int -hash (register const char *str, register unsigned int len) +class Perfect_Hash { +private: + static inline unsigned int hash (const char *str, unsigned int len); +public: + static const char *libc_name_p (const char *str, unsigned int len); +}; + +inline unsigned int +Perfect_Hash::hash (register const char *str, register unsigned int len) +{ static const unsigned short asso_values[] = { 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, @@ -122,14 +116,8 @@ along with GCC; see the file COPYING3. If not see 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) +Perfect_Hash::libc_name_p (register const char *str, register unsigned int len) { enum {
