diff options
| author | Jeff Law <law@gcc.gnu.org> | 1998-04-04 06:32:39 -0700 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1998-04-04 06:32:39 -0700 |
| commit | e5e809f4194e578b5fbd48fc5a1df2377f28d197 (patch) | |
| tree | 6743f11e58bd7a933b08900d973d89026cd11c43 /gcc/c-decl.c | |
| parent | 31031eddacda46a500b2390f52cd4474bcaf84ca (diff) | |
| download | gcc-e5e809f4194e578b5fbd48fc5a1df2377f28d197.zip gcc-e5e809f4194e578b5fbd48fc5a1df2377f28d197.tar.gz gcc-e5e809f4194e578b5fbd48fc5a1df2377f28d197.tar.bz2 | |
* Check in merge from gcc2. See ChangeLog.11 and ChangeLog.12
for details.
* haifa-sched.c: Mirror recent changes from gcc2.
From-SVN: r18984
Diffstat (limited to 'gcc/c-decl.c')
| -rw-r--r-- | gcc/c-decl.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gcc/c-decl.c b/gcc/c-decl.c index bf5d3ac..74ed907 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -1981,13 +1981,14 @@ duplicate_decls (newdecl, olddecl, different_binding_level) } if (different_binding_level) { - /* Don't output a duplicate symbol for this declaration. */ - TREE_ASM_WRITTEN (newdecl) = 1; + /* Don't output a duplicate symbol or debugging information for this + declaration. */ + TREE_ASM_WRITTEN (newdecl) = DECL_IGNORED_P (newdecl) = 1; return 0; } /* Copy most of the decl-specific fields of NEWDECL into OLDDECL. - But preserve OLDdECL's DECL_UID. */ + But preserve OLDDECL's DECL_UID. */ { register unsigned olddecl_uid = DECL_UID (olddecl); @@ -5163,9 +5164,6 @@ grokdeclarator (declarator, declspecs, decl_context, initialized) if (! strcmp (IDENTIFIER_POINTER (declarator), "main")) warning ("cannot inline function `main'"); - else if (last && (TYPE_MAIN_VARIANT (TREE_VALUE (last)) - != void_type_node)) - warning ("inline declaration ignored for function with `...'"); else /* Assume that otherwise the function can be inlined. */ DECL_INLINE (decl) = 1; |