From patchwork Mon Sep 17 14:23:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 29421 Received: (qmail 40445 invoked by alias); 17 Sep 2018 14:24:47 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 40227 invoked by uid 89); 17 Sep 2018 14:24:32 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, KAM_NUMSUBJECT autolearn=ham version=3.3.2 spammy=Hx-languages-length:1249 X-HELO: smtp.CeBiTec.Uni-Bielefeld.DE Received: from smtp.CeBiTec.Uni-Bielefeld.DE (HELO smtp.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 17 Sep 2018 14:24:31 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id D6090DB3 for ; Mon, 17 Sep 2018 16:24:28 +0200 (CEST) Received: from smtp.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 XqEVxcGE4BoS for ; Mon, 17 Sep 2018 16:23:57 +0200 (CEST) Received: from lokon.CeBiTec.Uni-Bielefeld.DE (lokon.CeBiTec.Uni-Bielefeld.DE [129.70.161.152]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id 0A92DDAB for ; Mon, 17 Sep 2018 16:23:57 +0200 (CEST) Received: (from ro@localhost) by lokon.CeBiTec.Uni-Bielefeld.DE (8.15.2+Sun/8.15.2/Submit) id w8HENu2t018665; Mon, 17 Sep 2018 16:23:56 +0200 (MEST) From: Rainer Orth To: gdb-patches@sourceware.org Subject: [PATCH] Handle 64-bit Solaris/x86 ld.so.1 Date: Mon, 17 Sep 2018 16:23:56 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (usg-unix-v) MIME-Version: 1.0 X-IsSubscribed: yes The next patch from the solaris-userland github repo (007-solib-svr4.patch) is equally trivial, creating partity between Solaris/SPARC and x86. Tested on amd64-pc-solaris2.11, ok for master? Rainer # HG changeset patch # Parent 24bcd64cb0c1824acde40384274e58fa9bf13438 Handle 64-bit Solaris/x86 ld.so.1 diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -153,8 +153,12 @@ svr4_same_1 (const char *gdb_so_name, co && strcmp (inferior_so_name, "/lib/ld.so.1") == 0) return 1; - /* Similarly, we observed the same issue with sparc64, but with + /* Similarly, we observed the same issue with amd64 and sparcv9, but with different locations. */ + if (strcmp (gdb_so_name, "/usr/lib/amd64/ld.so.1") == 0 + && strcmp (inferior_so_name, "/lib/amd64/ld.so.1") == 0) + return 1; + if (strcmp (gdb_so_name, "/usr/lib/sparcv9/ld.so.1") == 0 && strcmp (inferior_so_name, "/lib/sparcv9/ld.so.1") == 0) return 1;