|
|
From 5dce741e00f86a08a4c174fb3605d896f210ab52 Mon Sep 17 00:00:00 2001
|
|
|
From: Bernd Edlinger <bernd.edlinger@hotmail.de>
|
|
|
Date: Wed, 27 Jul 2016 13:30:03 +0300
|
|
|
Subject: [PATCH] 2016-02-19 Jakub Jelinek <jakub@redhat.com> Bernd Edlinger
|
|
|
<bernd.edlinger@hotmail.de>
|
|
|
|
|
|
* Make-lang.in: Invoke gperf with -L C++.
|
|
|
* cfns.gperf: Remove prototypes for hash and libc_name_p
|
|
|
inlines.
|
|
|
* cfns.h: Regenerated.
|
|
|
* except.c (nothrow_libfn_p): Adjust.
|
|
|
|
|
|
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@233572138bc75d-0d04-0410-961f-82ee72b054a4
|
|
|
|
|
|
This patch fixes building of gcc-4.x by gcc-6.x, for more details see
|
|
|
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69959
|
|
|
|
|
|
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
|
|
|
---
|
|
|
gcc/cp/Make-lang.in | 2 +-
|
|
|
gcc/cp/cfns.gperf | 10 ++--------
|
|
|
gcc/cp/cfns.h | 41 ++++++++++++++---------------------------
|
|
|
gcc/cp/except.c | 3 ++-
|
|
|
4 files changed, 19 insertions(+), 37 deletions(-)
|
|
|
|
|
|
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
|
|
|
index dce523a..36a1a97 100644
|
|
|
--- a/gcc/cp/Make-lang.in
|
|
|
+++ b/gcc/cp/Make-lang.in
|
|
|
@@ -115,7 +115,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
|
|
|
|
|
|
#
|
|
|
diff --git a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf
|
|
|
index c4c4e2a..5c40933 100644
|
|
|
--- a/gcc/cp/cfns.gperf
|
|
|
+++ b/gcc/cp/cfns.gperf
|
|
|
@@ -1,3 +1,5 @@
|
|
|
+%language=C++
|
|
|
+%define class-name libc_name
|
|
|
%{
|
|
|
/* Copyright (C) 2000-2013 Free Software Foundation, Inc.
|
|
|
|
|
|
@@ -16,14 +18,6 @@ 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);
|
|
|
%}
|
|
|
%%
|
|
|
# The standard C library functions, for feeding to gperf; the result is used
|
|
|
diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h
|
|
|
index 42dd3cf..6c79864 100644
|
|
|
--- a/gcc/cp/cfns.h
|
|
|
+++ b/gcc/cp/cfns.h
|
|
|
@@ -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) \
|
|
|
@@ -28,7 +28,7 @@
|
|
|
#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
|
|
|
#endif
|
|
|
|
|
|
-#line 1 "cfns.gperf"
|
|
|
+#line 3 "cfns.gperf"
|
|
|
|
|
|
/* Copyright (C) 2000-2013 Free Software Foundation, Inc.
|
|
|
|
|
|
@@ -47,25 +47,18 @@ 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);
|
|
|
/* 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 libc_name
|
|
|
+{
|
|
|
+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
|
|
|
+libc_name::hash (register const char *str, register unsigned int len)
|
|
|
{
|
|
|
static const unsigned short asso_values[] =
|
|
|
{
|
|
|
@@ -122,14 +115,8 @@ 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)
|
|
|
+libc_name::libc_name_p (register const char *str, register unsigned int len)
|
|
|
{
|
|
|
enum
|
|
|
{
|
|
|
diff --git a/gcc/cp/except.c b/gcc/cp/except.c
|
|
|
index 604f274..c3298cb 100644
|
|
|
--- a/gcc/cp/except.c
|
|
|
+++ b/gcc/cp/except.c
|
|
|
@@ -1025,7 +1025,8 @@ nothrow_libfn_p (const_tree fn)
|
|
|
unless the system headers are playing rename tricks, and if
|
|
|
they are, we don't want to be confused by them. */
|
|
|
id = DECL_NAME (fn);
|
|
|
- return !!libc_name_p (IDENTIFIER_POINTER (id), IDENTIFIER_LENGTH (id));
|
|
|
+ return !!libc_name::libc_name_p (IDENTIFIER_POINTER (id),
|
|
|
+ IDENTIFIER_LENGTH (id));
|
|
|
}
|
|
|
|
|
|
/* Returns nonzero if an exception of type FROM will be caught by a
|
|
|
--
|
|
|
2.7.4
|
|
|
|