diff options
| author | Jason Merrill <jason@redhat.com> | 2012-10-04 15:54:13 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2012-10-04 15:54:13 -0400 |
| commit | 42adab07c3e137e56f066979fa761d480560d7c8 (patch) | |
| tree | 394b74c870f021075c2bac8a6f8b7af93f82457b /gcc | |
| parent | 8608637610bbff2401fae51ca84c4b909c48bc33 (diff) | |
| download | gcc-42adab07c3e137e56f066979fa761d480560d7c8.zip gcc-42adab07c3e137e56f066979fa761d480560d7c8.tar.gz gcc-42adab07c3e137e56f066979fa761d480560d7c8.tar.bz2 | |
rs6000.c (rs6000_code_end): Protect the use of ASM_WEAKEN_DECL with #if RS6000_WEAK.
* config/rs6000/rs6000.c (rs6000_code_end): Protect the use of
ASM_WEAKEN_DECL with #if RS6000_WEAK.
From-SVN: r192101
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config/rs6000/rs6000.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2a79135..b2b69a2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2012-10-04 Jason Merrill <jason@redhat.com> + + * config/rs6000/rs6000.c (rs6000_code_end): Protect the use of + ASM_WEAKEN_DECL with #if RS6000_WEAK. + 2012-10-04 Basile Starynkevitch <basile@starynkevitch.net> * gengtype.c (walk_type): Emit mark_hook when inside a diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 3e3d553..f4e4dec 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -28295,6 +28295,7 @@ rs6000_code_end (void) TREE_PUBLIC (decl) = 1; TREE_STATIC (decl) = 1; +#if RS6000_WEAK if (USE_HIDDEN_LINKONCE) { DECL_COMDAT_GROUP (decl) = DECL_ASSEMBLER_NAME (decl); @@ -28307,6 +28308,7 @@ rs6000_code_end (void) ASM_DECLARE_FUNCTION_NAME (asm_out_file, name, decl); } else +#endif { switch_to_section (text_section); ASM_OUTPUT_LABEL (asm_out_file, name); |