From patchwork Tue Mar 19 12:26:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 229059 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 672BB2C00BD for ; Tue, 19 Mar 2013 23:59:32 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:mime-version:content-type; q=dns; s=dkim1; b=r2vzLR7rpa37btqVGqaw99Y9cX0gBncW7QrjhpOTZ1h0TNOnb4z5 uoquxWrbgrs50WoRV28GjWwQw80BtNayKkrkeiRBKpgz2i5AqstAwp4AI3dA8/wE UFxIPxEJc65KdCf09hZ/Wme6WQjL3bqtE8oNE48t0juaItA78IpalBM= DKIM-Signature: v=1; a=rsa-sha1; c=simple; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:mime-version:content-type; s= dkim1; bh=1GWOKI/F56F3crUxSQnKmDr69ic=; b=udKrDQXJk2/VG7iic9oF0n mtCGF5+I3zgAO4/B0d13lrTfSi9kwUuoNxwlB6d3ig6gMuHfFIwrcf1Ycwsl9FSZ 0pjGlgvt+Buqp1fBwlr9KwoPEGJc8PkbxEKgWQHIq7NacuvViShvmNh9gsyQi5mQ XbBgoAzHfpzec984Re+iQ= Received: (qmail 7500 invoked by alias); 19 Mar 2013 12:34:14 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 4358 invoked by uid 89); 19 Mar 2013 12:26:13 -0000 X-SWARE-Spam-Status: No, hits=-2.5 required=5.0 tests=RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 19 Mar 2013 12:26:13 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id A784B32B; Tue, 19 Mar 2013 13:26:11 +0100 (CET) Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id wLapnO2E1NgO; Tue, 19 Mar 2013 13:26:09 +0100 (CET) Received: from lokon.CeBiTec.Uni-Bielefeld.DE (lokon.CeBiTec.Uni-Bielefeld.DE [129.70.161.110]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id ED95132A; Tue, 19 Mar 2013 13:26:08 +0100 (CET) Received: (from ro@localhost) by lokon.CeBiTec.Uni-Bielefeld.DE (8.14.5+Sun/8.14.5/Submit) id r2JCQ8Ci007056; Tue, 19 Mar 2013 13:26:08 +0100 (MET) From: Rainer Orth To: gcc-patches@gcc.gnu.org Cc: Paolo Bonzini Subject: [build] Default to DWARF 4 on Solaris if linker supports CIEv3 Date: Tue, 19 Mar 2013 13:26:08 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (usg-unix-v) MIME-Version: 1.0 As described in Don't use DWARF 4 on Solaris http://gcc.gnu.org/ml/gcc-patches/2012-05/msg00445.html the Solaris linker couldn't handle CIEv3 in .eh_frame, so we defaulted to DWARF 2 on Solaris in any configuration (Sun or GNU ld). This has changed in Solaris 11.1, where the necessary support was added. The following patch checks for this and defaults to DWARF 4 if either a sufficiently recent Sun ld or GNU ld >= 2.16 is used. Bootstrapped without regressions on i386-pc-solaris2.11 (Solaris 11.1) with Sun ld and gld 2.23.1, and on i386-pc-solaris2.10 with Sun ld. Ok for mainline? Rainer 2013-03-18 Rainer Orth * configure.ac (gcc_cv_ld_eh_frame_ciev3): New test. * configure: Regenerate. * config.in: Regenerate. * config/sol2.c (solaris_override_options): Only enforce DWARF 2 if !HAVE_LD_EH_FRAME_CIEV3. # HG changeset patch # Parent 3a306dae3cef5064a01f87c8a575de5e630d3412 Default to DWARF 4 on Solaris if linker supports CIEv3 diff --git a/gcc/config/sol2.c b/gcc/config/sol2.c --- a/gcc/config/sol2.c +++ b/gcc/config/sol2.c @@ -286,8 +286,8 @@ solaris_file_end (void) void solaris_override_options (void) { - /* Don't emit DWARF3/4 unless specifically selected. Solaris ld cannot - handle CIE version 3 in .eh_frame. */ - if (!global_options_set.x_dwarf_version) + /* Older versions of Solaris ld cannot handle CIE version 3 in .eh_frame. + Don't emit DWARF3/4 unless specifically selected if so. */ + if (!HAVE_LD_EH_FRAME_CIEV3 && !global_options_set.x_dwarf_version) dwarf_version = 2; } diff --git a/gcc/configure.ac b/gcc/configure.ac --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -4335,6 +4335,42 @@ if test x"$gcc_cv_ld_eh_frame_hdr" = xye fi AC_MSG_RESULT($gcc_cv_ld_eh_frame_hdr) +AC_MSG_CHECKING(linker CIEv3 in .eh_frame support) +gcc_cv_ld_eh_frame_ciev3=no +if test $in_tree_ld = yes ; then + if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 16 -o "$gcc_cv_gld_major_version" -gt 2 \ + && test $in_tree_ld_is_elf = yes; then + gcc_cv_ld_eh_frame_ciev3=yes + fi +elif test x$gcc_cv_ld != x; then + if echo "$ld_ver" | grep GNU > /dev/null; then + gcc_cv_ld_eh_frame_ciev3=yes + if test 0"$ld_date" -lt 20040513; then + if test -n "$ld_date"; then + # If there was date string, but was earlier than 2004-05-13, fail + gcc_cv_ld_eh_frame_ciev3=no + elif test "$ld_vers_major" -lt 2; then + gcc_cv_ld_eh_frame_ciev3=no + elif test "$ld_vers_major" -eq 2 -a "$ld_vers_minor" -lt 16; then + gcc_cv_ld_eh_frame_ciev3=no + fi + fi + else + case "$target" in + *-*-solaris2*) + # Sun ld added support for CIE v3 in .eh_frame in Solaris 11.1. + if test "$ld_vers_major" -gt 1 || test "$ld_vers_minor" -ge 2324; then + gcc_cv_ld_eh_frame_ciev3=yes + fi + ;; + esac + fi +fi +AC_DEFINE_UNQUOTED(HAVE_LD_EH_FRAME_CIEV3, + [`if test x"$gcc_cv_ld_eh_frame_ciev3" = xyes; then echo 1; else echo 0; fi`], + [Define 0/1 if your linker supports CIE v3 in .eh_frame.]) +AC_MSG_RESULT($gcc_cv_ld_eh_frame_ciev3) + AC_MSG_CHECKING(linker position independent executable support) gcc_cv_ld_pie=no if test $in_tree_ld = yes ; then