aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorDominique d'Humieres <dominiq@lps.ens.fr>2015-04-28 19:16:19 +0200
committerDavid Edelsohn <dje@gcc.gnu.org>2015-04-28 13:16:19 -0400
commit68d15e8cce205659db7a30b9e8f1e15bcd0ac9ef (patch)
tree5ff9596a9602dc2e5e141eb48a79a23ef3f3da0b /gcc
parent0a5946254cd3a008fdf739bd8a37078b12f5041d (diff)
downloadgcc-68d15e8cce205659db7a30b9e8f1e15bcd0ac9ef.zip
gcc-68d15e8cce205659db7a30b9e8f1e15bcd0ac9ef.tar.gz
gcc-68d15e8cce205659db7a30b9e8f1e15bcd0ac9ef.tar.bz2
re PR bootstrap/65910 (r222473 breaks x86_64 darwin bootstrap)
2015-04-28 Dominique d'Humieres <dominiq@lps.ens.fr> PR bootstrap/65910 * varasm.c (assemble_end_function): Guard ASM_DECLARE_FUNCTION_SIZE. From-SVN: r222535
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/varasm.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3857fa0..cad2b91 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-28 Dominique d'Humieres <dominiq@lps.ens.fr>
+
+ PR bootstrap/65910
+ * varasm.c (assemble_end_function): Guard ASM_DECLARE_FUNCTION_SIZE.
+
2015-04-28 Jason Merrill <jason@redhat.com>
PR c++/65734
diff --git a/gcc/varasm.c b/gcc/varasm.c
index eab937f..9131e83 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -1864,10 +1864,12 @@ assemble_end_function (tree decl, const char *fnname ATTRIBUTE_UNUSED)
save_text_section = in_section;
switch_to_section (unlikely_text_section ());
+#ifdef ASM_DECLARE_FUNCTION_SIZE
if (cold_function_name != NULL_TREE)
ASM_DECLARE_FUNCTION_SIZE (asm_out_file,
IDENTIFIER_POINTER (cold_function_name),
decl);
+#endif
ASM_OUTPUT_LABEL (asm_out_file, crtl->subsections.cold_section_end_label);
if (first_function_block_is_cold)
switch_to_section (text_section);