From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21944 invoked by alias); 3 Jul 2009 09:52:43 -0000 Received: (qmail 21927 invoked by uid 22791); 3 Jul 2009 09:52:42 -0000 X-SWARE-Spam-Status: No, hits=-0.5 required=5.0 tests=AWL,BAYES_40,SARE_MSGID_LONG40,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mail-pz0-f203.google.com (HELO mail-pz0-f203.google.com) (209.85.222.203) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 03 Jul 2009 09:52:32 +0000 Received: by pzk41 with SMTP id 41so2141342pzk.12 for ; Fri, 03 Jul 2009 02:52:30 -0700 (PDT) MIME-Version: 1.0 Received: by 10.142.185.13 with SMTP id i13mr450618wff.58.1246614750494; Fri, 03 Jul 2009 02:52:30 -0700 (PDT) Date: Fri, 03 Jul 2009 09:52:00 -0000 Message-ID: Subject: [RFA] Check solib bfd arch From: Hui Zhu To: gdb-patches ml Cc: Michael Snyder Content-Type: multipart/mixed; boundary=000e0cd23e7c60000a046dca1d26 X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-07/txt/msg00089.txt.bz2 --000e0cd23e7c60000a046dca1d26 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-length: 1004 Hi, In cross-compile remote debug environment, the gdb will load the solib of local host if user doesn't set sysroot or something. Load the wrong lib will make gdb get error. So I make a patch check the solib bfd arch after load it. I am not check the other thing in arch_info because the mach of solib and inferior is not same (powerpc) sometime. This patch is tested in a i386 ubuntu and powerpc linux. Thanks, Hui 2009-07-03 Hui Zhu * solib.c (solib_bfd_open): Check solib bfd arch. --- solib.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/solib.c +++ b/solib.c @@ -311,6 +311,14 @@ solib_bfd_open (char *pathname) found_pathname, bfd_errmsg (bfd_get_error ())); } + /* Check bfd arch. */ + if (bfd_get_arch (abfd) != gdbarch_bfd_arch_info (target_gdbarch)->arch) + { + bfd_close (abfd); + make_cleanup (xfree, found_pathname); + error (_("`%s': ARCH not same with inferior."), found_pathname); + } + return abfd; } --000e0cd23e7c60000a046dca1d26 Content-Type: text/plain; charset=US-ASCII; name="solib-check-bfd_arch_info.txt" Content-Disposition: attachment; filename="solib-check-bfd_arch_info.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fwoq8vay0 Content-length: 663 LS0tCiBzb2xpYi5jIHwgICAgOCArKysrKysrKwogMSBmaWxlIGNoYW5nZWQs IDggaW5zZXJ0aW9ucygrKQoKLS0tIGEvc29saWIuYworKysgYi9zb2xpYi5j CkBAIC0zMTEsNiArMzExLDE0IEBAIHNvbGliX2JmZF9vcGVuIChjaGFyICpw YXRobmFtZSkKIAkgICAgIGZvdW5kX3BhdGhuYW1lLCBiZmRfZXJybXNnIChi ZmRfZ2V0X2Vycm9yICgpKSk7CiAgICAgfQogCisgIC8qIENoZWNrIGJmZCBh cmNoLiAgKi8KKyAgaWYgKGJmZF9nZXRfYXJjaCAoYWJmZCkgIT0gZ2RiYXJj aF9iZmRfYXJjaF9pbmZvICh0YXJnZXRfZ2RiYXJjaCktPmFyY2gpCisgICAg eworICAgICAgYmZkX2Nsb3NlIChhYmZkKTsKKyAgICAgIG1ha2VfY2xlYW51 cCAoeGZyZWUsIGZvdW5kX3BhdGhuYW1lKTsKKyAgICAgIGVycm9yIChfKCJg JXMnOiBBUkNIIG5vdCBzYW1lIHdpdGggaW5mZXJpb3IuIiksIGZvdW5kX3Bh dGhuYW1lKTsKKyAgICB9CisKICAgcmV0dXJuIGFiZmQ7CiB9CiAK --000e0cd23e7c60000a046dca1d26--