 @@ -107,27 +107,27 @@ ifeq ($(ENABLE_MAINTAINER_RULES), true)
 # Special build rule.  This is a maintainer rule, that is only
 # available when GCC is configured with --enable-maintainer-mode.  In
 # other cases, it is not available to avoid triggering rebuilds if a
 # user has the source checked out with unusual timestamps.
 $(srcdir)/cp/cfns.h: $(srcdir)/cp/cfns.gperf
 	@echo "NOT REBUILDING $@"
 NetBSD_DISABLED_cfns.h:
 else
 # We keep the rule so that you can still force a rebuild, even if you
 # didn't configure GCC with --enable-maintainer-mode, by manually
 # 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
+#
 # Build hooks:
 c++.all.cross: g++-cross$(exeext)
 c++.start.encap: xg++$(exeext)
 c++.rest.encap:
 c++.info:
 c++.install-info:
 c++.dvi:
 c++.pdf:
 c++.install-pdf:

 @@ -1,39 +1,33 @@
 %language=C++
 %define class-name libc_name
 %{
 /* Copyright (C) 2000-2013 Free Software Foundation, Inc.
 This file is part of GCC.
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 Software Foundation; either version 3, or (at your option) any later
 version.
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 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
 # by nothrow_libfn_p.
+#
 #   [lib.res.on.exception.handling]: None of the functions from the
 #   Standard C library shall report an error by throwing an
 #   exception, unless it calls a program-supplied function that
 #   throws an exception.
+#
 # Specific functions are commented out for the reason noted in each case.
+#
 # abort			-- synchronous exception from SIGABRT handler

 @@ -1,15 +1,15 @@
-/* ANSI-C code produced by gperf version 3.0.3 */
+/* 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 ANSI-C cfns.gperf  */
+/* 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) \
       && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
       && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
       && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
       && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
       && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
       && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
       && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
       && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
       && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
       && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
 @@ -18,64 +18,57 @@
       && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
       && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
       && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
       && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
       && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
       && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
       && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
       && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
       && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
 /* The character set is not based on ISO-646.  */
 #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.
 This file is part of GCC.
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 Software Foundation; either version 3, or (at your option) any later
 version.
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 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__
+class libc_name
 __inline
-#else
+private:
-#ifdef __cplusplus
+  static inline unsigned int hash (const char *str, unsigned int len);
-inline
+public:
-#endif
+  static const char *libc_name_p (const char *str, unsigned int len);
-#endif
+};
 static unsigned int
-hash (register const char *str, register unsigned int len)
+inline unsigned int
 libc_name::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, 400, 400, 400, 400, 400, 400, 400, 400,
 , 400, 400, 400, 400, 400, 400, 400, 400, 400,
 , 400, 400, 400, 400, 400, 400, 400, 400, 400,
 , 400, 400, 400, 400, 400, 400, 400,   0,   0,
 , 400, 400, 400, 400, 400, 400, 400, 400, 400,
 , 400, 400, 400, 400, 400, 400, 400, 400, 400,
 , 400, 400, 400, 400, 400, 400, 400, 400, 400,
 , 400, 400, 400, 400, 400, 400, 400, 400, 400,
 , 400, 400, 400, 400, 400, 400,  28,  90,   0,
 @@ -112,34 +105,28 @@ hash (register const char *str, register
       case 3:
         hval += asso_values[(unsigned char)str[2]];
       /*FALLTHROUGH*/
       case 2:
         hval += asso_values[(unsigned char)str[1]];
       /*FALLTHROUGH*/
       case 1:
         hval += asso_values[(unsigned char)str[0]];
         break;
+    }
   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
+    {
       TOTAL_KEYWORDS = 156,
       MIN_WORD_LENGTH = 3,
       MAX_WORD_LENGTH = 10,
       MIN_HASH_VALUE = 9,
       MAX_HASH_VALUE = 399
     };
   static const char * const wordlist[] =
+    {
       "wcsstr",

 @@ -1015,27 +1015,28 @@ nothrow_libfn_p (const_tree fn)
   if (TREE_PUBLIC (fn)
       && DECL_EXTERNAL (fn)
       && DECL_NAMESPACE_SCOPE_P (fn)
       && DECL_EXTERN_C_P (fn))
     /* OK */;
   else
     /* Can't be a C library function.  */
     return 0;
   /* Being a C library function, DECL_ASSEMBLER_NAME == DECL_NAME
      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
    handler for type TO, as per [except.handle].  */
 static int
 can_convert_eh (tree to, tree from)
+{
   to = non_reference (to);
   from = non_reference (from);
   if (TREE_CODE (to) == POINTER_TYPE && TREE_CODE (from) == POINTER_TYPE)
+    {