Module Name: src
Committed By: snj
Date: Tue Jun 14 09:03:52 UTC 2016
Modified Files:
src/external/gpl3/gcc/dist/gcc/cp [netbsd-7]: Make-lang.in cfns.gperf
cfns.h except.c
Log Message:
Pull up following revision(s) (requested by kamil in ticket #1176):
external/gpl3/gcc/dist/gcc/cp/cfns.h: revision 1.2
external/gpl3/gcc/dist/gcc/cp/except.c: revision 1.2
external/gpl3/gcc/dist/gcc/cp/Make-lang.in: revision 1.6
external/gpl3/gcc/dist/gcc/cp/cfns.gperf: revision 1.2
Fix building GCC-5.3 with GCC-6.1
Cherry-pick upstream patch:
>From 1e5f1089dec3af328fd03125d6778f666d0bd4e4 Mon Sep 17 00:00:00 2001
From: edlinger <edlinger@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 25 Feb 2016 15:33:50 +0000
Subject: [PATCH] 2016-02-25 Bernd Edlinger
<bernd.edlinger%hotmail.de@localhost>
Backported from mainline
2016-02-19 Jakub Jelinek <jakub%redhat.com@localhost>
Bernd Edlinger <bernd.edlinger%hotmail.de@localhost>
* 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/branches/gcc-5-branch@233720
138bc75d-0d04-0410-961f-82ee72b054a4
Verified to work with GCC 5.3 and 6.1.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.2.1 src/external/gpl3/gcc/dist/gcc/cp/Make-lang.in
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.4.1 \
src/external/gpl3/gcc/dist/gcc/cp/cfns.gperf \
src/external/gpl3/gcc/dist/gcc/cp/cfns.h \
src/external/gpl3/gcc/dist/gcc/cp/except.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/cp/Make-lang.in
diff -u src/external/gpl3/gcc/dist/gcc/cp/Make-lang.in:1.4 src/external/gpl3/gcc/dist/gcc/cp/Make-lang.in:1.4.2.1
--- src/external/gpl3/gcc/dist/gcc/cp/Make-lang.in:1.4 Sat Apr 19 12:41:31 2014
+++ src/external/gpl3/gcc/dist/gcc/cp/Make-lang.in Tue Jun 14 09:03:52 2016
@@ -117,7 +117,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: src/external/gpl3/gcc/dist/gcc/cp/cfns.gperf
diff -u src/external/gpl3/gcc/dist/gcc/cp/cfns.gperf:1.1.1.2 src/external/gpl3/gcc/dist/gcc/cp/cfns.gperf:1.1.1.2.4.1
--- src/external/gpl3/gcc/dist/gcc/cp/cfns.gperf:1.1.1.2 Sat Mar 1 08:43:04 2014
+++ src/external/gpl3/gcc/dist/gcc/cp/cfns.gperf Tue Jun 14 09:03:52 2016
@@ -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
Index: src/external/gpl3/gcc/dist/gcc/cp/cfns.h
diff -u src/external/gpl3/gcc/dist/gcc/cp/cfns.h:1.1.1.2 src/external/gpl3/gcc/dist/gcc/cp/cfns.h:1.1.1.2.4.1
--- src/external/gpl3/gcc/dist/gcc/cp/cfns.h:1.1.1.2 Sat Mar 1 08:43:09 2014
+++ src/external/gpl3/gcc/dist/gcc/cp/cfns.h Tue Jun 14 09:03:52 2016
@@ -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-gp...@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
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
{
Index: src/external/gpl3/gcc/dist/gcc/cp/except.c
diff -u src/external/gpl3/gcc/dist/gcc/cp/except.c:1.1.1.2 src/external/gpl3/gcc/dist/gcc/cp/except.c:1.1.1.2.4.1
--- src/external/gpl3/gcc/dist/gcc/cp/except.c:1.1.1.2 Sat Mar 1 08:43:05 2014
+++ src/external/gpl3/gcc/dist/gcc/cp/except.c Tue Jun 14 09:03:52 2016
@@ -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
