From patchwork Fri Oct 16 17:58:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1383487 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=DCxbCI6X; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CCYmp1v47z9sSG for ; Sat, 17 Oct 2020 04:58:48 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 286D63851C3C; Fri, 16 Oct 2020 17:58:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 286D63851C3C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1602871125; bh=fJZD6vPiN1sDxCb1jgLtLg7zg904tA6bSqCVnit+1Us=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=DCxbCI6XzgMDAre6wqymTEC73w5pN2Pd4IY/2OLruV+Euq0ph1IH8Ah+YmyJ1vtYp NOA+NQiOr7AOZffQTzTL5JBkA81FMlMFXzAStIYbajHwYJFG2Jrg2htmfIG0Nl2urj T4GVtHc9szaPXyt/j5+ZA9RExepx2e/hw4SWABRs= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) by sourceware.org (Postfix) with ESMTPS id 053363857023 for ; Fri, 16 Oct 2020 17:58:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 053363857023 Received: by mail-pf1-x442.google.com with SMTP id x13so1914948pfa.9 for ; Fri, 16 Oct 2020 10:58:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fJZD6vPiN1sDxCb1jgLtLg7zg904tA6bSqCVnit+1Us=; b=IRFPUOG0ibHgcp9ItfS7/mopXAolIFwRay4XjTS+UxGyNfijmZ3/eYRdu/e1HCnAHI CvCysuBegxjSsZxoP4mek4H0IojymwgdI7tvFExXK6/cqoyLx7Id5pYA5TJNlVzWhqby Rc1OAKaKXkMWLjvQRPxfnrmnuITDPqKhFMfQ9ffZhkBp6tPAjnbyvKeKPnxkINYBhqP2 w1FdYzEq+x4aMnKeycPX426RHZ1BW4iHfzLlXdseumbXxXKtN+kj9q/8K9bFbCz2NF67 EFqx15M8Q5we8bBAoAnfHxtlCApzDr8lFZX7qEceVETqFW/VHBQeak6b7OmWS7rOGTyN jllw== X-Gm-Message-State: AOAM533rC7rCJt5Ov5ca9fOy4nRfx7pshiLSm+aw4wws5/KshHP+ZChu pl2ccEjBiyZ8p0gspMTgk2rIZuyQfX0= X-Google-Smtp-Source: ABdhPJz8FdhSaB9UQp00Og5vNdQrnosU+YWMxChBRObMAmxK6LEklpgEaCistJ0YSfsB8Eg3QoXhIg== X-Received: by 2002:a62:1d01:0:b029:155:258a:d20 with SMTP id d1-20020a621d010000b0290155258a0d20mr4676455pfd.25.1602871118496; Fri, 16 Oct 2020 10:58:38 -0700 (PDT) Received: from gnu-cfl-2.localdomain (c-69-181-90-243.hsd1.ca.comcast.net. [69.181.90.243]) by smtp.gmail.com with ESMTPSA id w17sm3525354pga.16.2020.10.16.10.58.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Oct 2020 10:58:37 -0700 (PDT) Received: from gnu-cfl-2.localdomain (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id 3AA111A0167; Fri, 16 Oct 2020 10:58:35 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] Check for working assembler --gdwarf-[45] options Date: Fri, 16 Oct 2020 10:58:34 -0700 Message-Id: <20201016175834.2289120-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Spam-Status: No, score=-3041.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Gcc-patches" From: "H.J. Lu" Reply-To: "H.J. Lu" Cc: Jakub Jelinek Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Don't set HAVE_AS_GDWARF_5_DEBUG_FLAG nor HAVE_AS_WORKING_DWARF_4_FLAG if there is an extra assembly input file in debug info generated by --gdwarf-5/--gdwarf-4: https://sourceware.org/bugzilla/show_bug.cgi?id=25878 https://sourceware.org/bugzilla/show_bug.cgi?id=26740 Also replace success with dwarf4_success in the 32-bit --gdwarf-4 check. OK for master? PR bootstrap/97451 * configure.ac (HAVE_AS_GDWARF_5_DEBUG_FLAG): Don't define if there is an extra assembly input file in debug info. (HAVE_AS_WORKING_DWARF_4_FLAG): Likewise. Replace success with dwarf4_success in the 32-bit --gdwarf-4 check. * configure: Regenerated. --- gcc/configure | 114 ++++++++++++++++++++++++++++++++++++++++++++--- gcc/configure.ac | 70 ++++++++++++++++++++++++++--- 2 files changed, 172 insertions(+), 12 deletions(-) diff --git a/gcc/configure b/gcc/configure index abff47d30eb..d63c2331157 100755 --- a/gcc/configure +++ b/gcc/configure @@ -28475,6 +28475,7 @@ $as_echo "#define HAVE_AS_GDWARF2_DEBUG_FLAG 1" >>confdefs.h fi + dwarf5_success=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for --gdwarf-5 option" >&5 $as_echo_n "checking assembler for --gdwarf-5 option... " >&6; } if ${gcc_cv_as_gdwarf_5_flag+:} false; then : @@ -28506,9 +28507,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_gdwarf_5_flag" >&5 $as_echo "$gcc_cv_as_gdwarf_5_flag" >&6; } if test $gcc_cv_as_gdwarf_5_flag = yes; then - -$as_echo "#define HAVE_AS_GDWARF_5_DEBUG_FLAG 1" >>confdefs.h - + dwarf5_success=yes fi @@ -28701,7 +28700,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_debug_line_32_flag" >&5 $as_echo "$gcc_cv_as_debug_line_32_flag" >&6; } if test $gcc_cv_as_debug_line_32_flag = yes; then - success=yes + dwarf4_success=yes fi else @@ -28741,6 +28740,7 @@ fi fi if test $dwarf4_success = yes; then + dwarf4_success=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for --gdwarf-4 not refusing compiler generated .debug_line" >&5 $as_echo_n "checking assembler for --gdwarf-4 not refusing compiler generated .debug_line... " >&6; } if ${gcc_cv_as_dwarf_4_debug_line_flag+:} false; then : @@ -28772,9 +28772,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_dwarf_4_debug_line_flag" >&5 $as_echo "$gcc_cv_as_dwarf_4_debug_line_flag" >&6; } if test $gcc_cv_as_dwarf_4_debug_line_flag = yes; then - -$as_echo "#define HAVE_AS_WORKING_DWARF_4_FLAG 1" >>confdefs.h - + dwarf4_success=yes fi break @@ -28785,6 +28783,108 @@ fi dwarf4_line_sz=5 done + conftest_s="\ + .text + .globl foo + .type foo, %function +foo: + $insn + .size foo, .-foo + .file 0 \"foo.c\" +" + if test $dwarf5_success = yes; then + dwarf5_success=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for working --gdwarf-5 option" >&5 +$as_echo_n "checking assembler for working --gdwarf-5 option... " >&6; } +if ${gcc_cv_as_working_gdwarf_5_flag+:} false; then : + $as_echo_n "(cached) " >&6 +else + gcc_cv_as_working_gdwarf_5_flag=no + if test x$gcc_cv_as != x; then + $as_echo "$conftest_s" > conftest.s + if { ac_try='$gcc_cv_as $gcc_cv_as_flags --gdwarf-5 -o conftest.o conftest.s >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } + then + if test x$gcc_cv_readelf != x \ + && $gcc_cv_readelf -w conftest.o 2>&1 \ + | grep conftest.s > /dev/null 2>&1; then + dwarf5_success=no + else + dwarf5_success=yes + fi + else + echo "configure: failed program was" >&5 + cat conftest.s >&5 + fi + rm -f conftest.o conftest.s + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_working_gdwarf_5_flag" >&5 +$as_echo "$gcc_cv_as_working_gdwarf_5_flag" >&6; } + + + if test $dwarf5_success = yes; then + +$as_echo "#define HAVE_AS_GDWARF_5_DEBUG_FLAG 1" >>confdefs.h + + fi + fi + + conftest_s="\ + .text + .globl foo + .type foo, %function +foo: + $insn + .size foo, .-foo + .file 1 \"foo.c\" +" + if test $dwarf4_success = yes; then + dwarf4_success=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for working --gdwarf-4 option" >&5 +$as_echo_n "checking assembler for working --gdwarf-4 option... " >&6; } +if ${gcc_cv_as_working_gdwarf_4_flag+:} false; then : + $as_echo_n "(cached) " >&6 +else + gcc_cv_as_working_gdwarf_4_flag=no + if test x$gcc_cv_as != x; then + $as_echo "$conftest_s" > conftest.s + if { ac_try='$gcc_cv_as $gcc_cv_as_flags --gdwarf-4 -o conftest.o conftest.s >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } + then + if test x$gcc_cv_readelf != x \ + && $gcc_cv_readelf -w conftest.o 2>&1 \ + | grep conftest.s > /dev/null 2>&1; then + dwarf4_success=no + else + dwarf4_success=yes + fi + else + echo "configure: failed program was" >&5 + cat conftest.s >&5 + fi + rm -f conftest.o conftest.s + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_working_gdwarf_4_flag" >&5 +$as_echo "$gcc_cv_as_working_gdwarf_4_flag" >&6; } + + + if test $dwarf4_success = yes; then + +$as_echo "#define HAVE_AS_WORKING_DWARF_4_FLAG 1" >>confdefs.h + + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for --gstabs option" >&5 $as_echo_n "checking assembler for --gstabs option... " >&6; } if ${gcc_cv_as_gstabs_flag+:} false; then : diff --git a/gcc/configure.ac b/gcc/configure.ac index 26a5d8e3619..0da3009fa5d 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -5197,11 +5197,11 @@ if test x"$insn" != x; then [AC_DEFINE(HAVE_AS_GDWARF2_DEBUG_FLAG, 1, [Define if your assembler supports the --gdwarf2 option.])]) + dwarf5_success=no gcc_GAS_CHECK_FEATURE([--gdwarf-5 option], gcc_cv_as_gdwarf_5_flag, [elf,2,36,0], [--gdwarf-5], [$insn],, - [AC_DEFINE(HAVE_AS_GDWARF_5_DEBUG_FLAG, 1, -[Define if your assembler supports the --gdwarf-5 option.])]) + [dwarf5_success=yes]) dwarf4_debug_info_size=0x46 dwarf4_high_pc_form=7 @@ -5364,7 +5364,7 @@ foo: gcc_GAS_CHECK_FEATURE([assembly of compiler generated 32-bit .debug_line], gcc_cv_as_debug_line_32_flag, [elf,2,36,0], [], [$conftest_s],, - [success=yes]) + [dwarf4_success=yes]) else gcc_GAS_CHECK_FEATURE([assembly of compiler generated 64-bit .debug_line], gcc_cv_as_debug_line_64_flag, @@ -5372,11 +5372,11 @@ foo: [dwarf4_success=yes]) fi if test $dwarf4_success = yes; then + dwarf4_success=no gcc_GAS_CHECK_FEATURE([--gdwarf-4 not refusing compiler generated .debug_line], gcc_cv_as_dwarf_4_debug_line_flag, [elf,2,36,0], [--gdwarf-4], [$conftest_s],, - [AC_DEFINE(HAVE_AS_WORKING_DWARF_4_FLAG, 1, -[Define if your assembler supports --gdwarf-4 even with compiler generated .debug_line])]) + [dwarf4_success=yes]) break fi dwarf4_debug_info_size=0x36 @@ -5385,6 +5385,66 @@ foo: dwarf4_line_sz=5 done + conftest_s="\ + .text + .globl foo + .type foo, %function +foo: + $insn + .size foo, .-foo + .file 0 \"foo.c\" +" + if test $dwarf5_success = yes; then + dwarf5_success=no + gcc_GAS_CHECK_FEATURE([working --gdwarf-5 option], + gcc_cv_as_working_gdwarf_5_flag,, + [--gdwarf-5], + [$conftest_s], + [changequote(,)dnl + if test x$gcc_cv_readelf != x \ + && $gcc_cv_readelf -w conftest.o 2>&1 \ + | grep conftest.s > /dev/null 2>&1; then + dwarf5_success=no + else + dwarf5_success=yes + fi + changequote([,])dnl]) + if test $dwarf5_success = yes; then + AC_DEFINE(HAVE_AS_GDWARF_5_DEBUG_FLAG, 1, +[Define if your assembler supports the --gdwarf-5 option.]) + fi + fi + + conftest_s="\ + .text + .globl foo + .type foo, %function +foo: + $insn + .size foo, .-foo + .file 1 \"foo.c\" +" + if test $dwarf4_success = yes; then + dwarf4_success=no + gcc_GAS_CHECK_FEATURE([working --gdwarf-4 option], + gcc_cv_as_working_gdwarf_4_flag,, + [--gdwarf-4], + [$conftest_s], + [changequote(,)dnl + if test x$gcc_cv_readelf != x \ + && $gcc_cv_readelf -w conftest.o 2>&1 \ + | grep conftest.s > /dev/null 2>&1; then + dwarf4_success=no + else + dwarf4_success=yes + fi + changequote([,])dnl]) + if test $dwarf4_success = yes; then + AC_DEFINE(HAVE_AS_WORKING_DWARF_4_FLAG, 1, +[Define if your assembler supports --gdwarf-4 even with compiler generated .debug_line]) + fi + fi + gcc_GAS_CHECK_FEATURE([--gstabs option], gcc_cv_as_gstabs_flag, [elf,2,11,0], [--gstabs], [$insn],,