OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

c++: Regenerate cp/cfns.h.

Browse Source 
Current cfns.h includes register-qualified variables and that wouldn't
play well when bootstrapping with GCC that uses the C++17 dialect,
because 'register' was removed in C++17.  Regenerating it using the
command specified in cfns.h luckily cleaned this up.

	* cfns.h: Regenerated.
This commit is contained in:
Marek Polacek 2020-05-15 17:54:05 -04:00
parent c917584aa9
commit 642dc602f8
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,3 +1,7 @@
2020-05-17 Marek Polacek <polacek@redhat.com>
* cfns.h: Regenerated.
2020-05-17 Iain Sandoe <iain@sandoe.co.uk>
* coroutines.cc (morph_fn_to_coro): Initialize the gro variable.

36
gcc/cp/cfns.h
View File

@ -1,4 +1,4 @@
/* C++ code produced by gperf version 3.0.4 */
/* C++ code produced by gperf version 3.1 */
/* 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) \
@ -25,7 +25,7 @@
&& ('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>."
#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
#endif
#line 4 "cfns.gperf"
@ -54,13 +54,13 @@ struct libc_name_struct { const char *name; int c_ver; };
class libc_name
{
private:
static inline unsigned int hash (const char *str, unsigned int len);
static inline unsigned int hash (const char *str, size_t len);
public:
static const struct libc_name_struct *libc_name_p (const char *str, unsigned int len);
static const struct libc_name_struct *libc_name_p (const char *str, size_t len);
};
inline unsigned int
libc_name::hash (register const char *str, register unsigned int len)
libc_name::hash (const char *str, size_t len)
{
static const unsigned short asso_values[] =
{
@ -91,34 +91,34 @@ libc_name::hash (register const char *str, register unsigned int len)
1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488,
1488, 1488, 1488, 1488, 1488, 1488, 1488
};
register int hval = len;
unsigned int hval = len;
switch (hval)
{
default:
hval += asso_values[(unsigned char)str[5]+1];
hval += asso_values[static_cast<unsigned char>(str[5]+1)];
/*FALLTHROUGH*/
case 5:
hval += asso_values[(unsigned char)str[4]];
hval += asso_values[static_cast<unsigned char>(str[4])];
/*FALLTHROUGH*/
case 4:
hval += asso_values[(unsigned char)str[3]];
hval += asso_values[static_cast<unsigned char>(str[3])];
/*FALLTHROUGH*/
case 3:
hval += asso_values[(unsigned char)str[2]];
hval += asso_values[static_cast<unsigned char>(str[2])];
/*FALLTHROUGH*/
case 2:
hval += asso_values[(unsigned char)str[1]+1];
hval += asso_values[static_cast<unsigned char>(str[1]+1)];
/*FALLTHROUGH*/
case 1:
hval += asso_values[(unsigned char)str[0]];
hval += asso_values[static_cast<unsigned char>(str[0])];
break;
}
return hval + asso_values[(unsigned char)str[len - 1]];
return hval + asso_values[static_cast<unsigned char>(str[len - 1])];
}
const struct libc_name_struct *
libc_name::libc_name_p (register const char *str, register unsigned int len)
libc_name::libc_name_p (const char *str, size_t len)
{
enum
{
@ -1116,15 +1116,15 @@ libc_name::libc_name_p (register const char *str, register unsigned int len)
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
{
register int key = hash (str, len);
unsigned int key = hash (str, len);
if (key <= MAX_HASH_VALUE && key >= 0)
if (key <= MAX_HASH_VALUE)
{
register int index = lookup[key];
int index = lookup[key];
if (index >= 0)
{
register const char *s = wordlist[index].name;
const char *s = wordlist[index].name;
if (*str == *s && !strcmp (str + 1, s + 1))
return &wordlist[index];