One of the recent header file changes (haven't check which) broke
mainline Solaris bootstrap:
/vol/gcc/src/hg/trunk/local/gcc/read-md.c: In function 'char*
decimal_string(int)':
/vol/gcc/src/hg/trunk/local/gcc/read-md.c:782:27: error: 'char*
decimal_string(int)' redeclared as different kind of symbol
decimal_string (int number)
^
In file included from /usr/include/math.h:321:0,
from
/var/gcc/regression/trunk/12-gcc/build/prev-i386-pc-solaris2.12/libstdc++-v3/include/cmath:44,
from
/var/gcc/regression/trunk/12-gcc/build/prev-i386-pc-solaris2.12/libstdc++-v3/include/random:38,
from
/var/gcc/regression/trunk/12-gcc/build/prev-i386-pc-solaris2.12/libstdc++-v3/include/bits/stl_algo.h:66,
from
/var/gcc/regression/trunk/12-gcc/build/prev-i386-pc-solaris2.12/libstdc++-v3/include/algorithm:62,
from /vol/gcc/src/hg/trunk/local/gcc/system.h:218,
from
/var/gcc/regression/trunk/12-gcc/build/prev-i386-pc-solaris2.12/libstdc++-v3/include/algorithm:62,
from /vol/gcc/src/hg/trunk/local/gcc/system.h:218,
from /vol/gcc/src/hg/trunk/local/gcc/read-md.c:21:
/usr/include/floatingpoint.h:88:14: note: previous declaration 'typedef char
decimal_string [512]'
typedef char decimal_string[DECIMAL_STRING_LENGTH];
^
/vol/gcc/src/hg/trunk/local/gcc/read-md.c: In function 'void handle_enum(int,
bool)':
/vol/gcc/src/hg/trunk/local/gcc/read-md.c:854:41: error: functional cast to
array type 'decimal_string {aka char [512]}'
decimal_string (def->num_values), def);
^
/vol/gcc/src/hg/trunk/local/gcc/read-md.c: At global scope:
/vol/gcc/src/hg/trunk/local/gcc/read-md.c:782:1: error: 'char*
decimal_string(int)' defined but not used [-Werror=unused-function]
decimal_string (int number)
^
I took the easy way out and renamed the read-md.c function to avoid the
clash. Bootstrapped on i386-pc-solaris2.11. Ok for mainline?
Rainer
2015-07-06 Rainer Orth <[email protected]>
* read-md.c (decimal_string): Rename to ...
(md_decimal_string): ... this.
(handle_enum): Reflect this.
# HG changeset patch
# Parent 8d51390422669c8929e6b44770ca6716188d001a
Rename read-md.c:decimal_string
diff --git a/gcc/read-md.c b/gcc/read-md.c
--- a/gcc/read-md.c
+++ b/gcc/read-md.c
@@ -779,7 +779,7 @@ traverse_md_constants (htab_trav callbac
/* Return a malloc()ed decimal string that represents number NUMBER. */
static char *
-decimal_string (int number)
+md_decimal_string (int number)
{
/* A safe overestimate. +1 for sign, +1 for null terminator. */
char buffer[sizeof (int) * CHAR_BIT + 1 + 1];
@@ -851,7 +851,7 @@ handle_enum (int lineno, bool md_p)
ev->name = value_name;
}
ev->def = add_constant (md_constants, value_name,
- decimal_string (def->num_values), def);
+ md_decimal_string (def->num_values), def);
*def->tail_ptr = ev;
def->tail_ptr = &ev->next;
--
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University
