From 352cf98ffb32c1f0fa8b961314faf6e6afffb661 Mon Sep 17 00:00:00 2001 From: Dominik Vogt Date: Wed, 12 Feb 2014 05:53:34 +0000 Subject: [PATCH 1/2] S390: Fix crash when -mhotpatch encounters nested functions (e.g. with gfortran). --- gcc/config/s390/s390.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c index 32a25a4..9ae8ffd 100644 --- a/gcc/config/s390/s390.c +++ b/gcc/config/s390/s390.c @@ -5510,9 +5510,8 @@ s390_asm_output_function_label (FILE *asm_out_file, const char *fname, if (hotpatch_trampoline_halfwords >= 0 && decl_function_context (decl) != NULL_TREE) { - warning_at (0, DECL_SOURCE_LOCATION (decl), - "hotpatch_prologue is not compatible with nested" - " function"); + warning_at (0, OPT_mhotpatch, + "hotpatching is not compatible with nested functions"); hotpatch_trampoline_halfwords = -1; } } -- 1.8.3.1