diff options
Diffstat (limited to 'gcc/c')
| -rw-r--r-- | gcc/c/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c/c-decl.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index 9a9eed3..cc335e4 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,8 @@ +2013-11-06 DJ Delorie <dj@redhat.com> + + * c-decl.c (locate_old_decl): If a previous conflicting decl is + both explicit and builtin, print the location of the explicit one. + 2013-11-05 Tobias Burnus <burnus@net-b.de> * c-parser.c (c_parser_omp_for, c_parser_omp_parallel, diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c index 2833fdb..23f0516 100644 --- a/gcc/c/c-decl.c +++ b/gcc/c/c-decl.c @@ -1634,7 +1634,8 @@ validate_proto_after_old_defn (tree newdecl, tree newtype, tree oldtype) static void locate_old_decl (tree decl) { - if (TREE_CODE (decl) == FUNCTION_DECL && DECL_BUILT_IN (decl)) + if (TREE_CODE (decl) == FUNCTION_DECL && DECL_BUILT_IN (decl) + && !C_DECL_DECLARED_BUILTIN (decl)) ; else if (DECL_INITIAL (decl)) inform (input_location, "previous definition of %q+D was here", decl); |