From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21697 invoked by alias); 12 Sep 2013 06:31:42 -0000 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 Received: (qmail 21685 invoked by uid 89); 12 Sep 2013 06:31:42 -0000 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 12 Sep 2013 06:31:42 +0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.8 required=5.0 tests=AWL,BAYES_00,GARBLED_BODY,KHOP_THREADED,RDNS_NONE,SPF_HELO_FAIL autolearn=no version=3.3.2 X-HELO: relay1.mentorg.com Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1VK0RF-0004I1-Ip from Hui_Zhu@mentor.com ; Wed, 11 Sep 2013 23:31:37 -0700 Received: from SVR-ORW-FEM-04.mgc.mentorg.com ([147.34.97.41]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 11 Sep 2013 23:31:37 -0700 Received: from [127.0.0.1] (147.34.91.1) by svr-orw-fem-04.mgc.mentorg.com (147.34.97.41) with Microsoft SMTP Server id 14.2.247.3; Wed, 11 Sep 2013 23:31:37 -0700 Message-ID: <52315FC6.4000005@mentor.com> Date: Thu, 12 Sep 2013 06:31:00 -0000 From: Hui Zhu User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.0 MIME-Version: 1.0 To: Yao Qi CC: Hui Zhu , gdb-patches ml Subject: Re: [PATCH] Fix gdb.base/shreloc.exp: (msymbol) relocated functions have different addresses fail in cygwin References: <522DD104.6090808@codesourcery.com> In-Reply-To: Content-Type: multipart/mixed; boundary="------------080400060404060006080200" X-IsSubscribed: yes X-SW-Source: 2013-09/txt/msg00368.txt.bz2 --------------080400060404060006080200 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit Content-length: 1245 On 09/09/13 22:26, Hui Zhu wrote: > On Mon, Sep 9, 2013 at 9:45 PM, Yao Qi wrote: >> On 09/09/2013 04:40 PM, Hui Zhu wrote: >>> >>> - send_gdb "shell grep -E \" ${var}(\[ \t\]+.*)?\$\" ${msymfile}\n" >>> + if { "${plus_var}" == "" } { >>> + send_gdb "shell grep -E \" ${var}(\[ \t\]+.*)?\$\" ${msymfile}\n" >>> + } else { >>> + send_gdb "shell grep -E \" ${plus_var} .* ${var}(\[ \t\]+.*)?\$\" >>> ${msymfile}\n" >>> + } >> >> >> Why don't do this unconditionally? >> >> send_gdb "shell grep -E \" T .* ${var}(\[ \t\]+.*)?\$\" ${msymfile}\n" > > > Because other test use this function too. > > Thanks, > Hui > >> >> -- >> Yao (齐尧) Hi, After dicsussion with Yao. I got that on any targets, fn_[12] should be in .text section, so 'T' should work for all targets. And the purpose of this test is to make sure that " (msymbol) relocated functions have different addresses". So I change this patch to just check "T" symbol for any target. Thanks, Hui 2013-09-12 Hui Zhu * gdb.base/shreloc.exp (get_msym_addrs): Add argument "plus_var". (check_different): Ditto. ((msymbol) relocated functions have different addresses): Add argument 'T' when call check_different. --------------080400060404060006080200 Content-Type: text/plain; charset="us-ascii"; name="fix-cygwin-shreloc.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="fix-cygwin-shreloc.txt" Content-length: 2221 LS0tIGEvZ2RiL3Rlc3RzdWl0ZS9nZGIuYmFzZS9zaHJlbG9jLmV4cAorKysg Yi9nZGIvdGVzdHN1aXRlL2dkYi5iYXNlL3NocmVsb2MuZXhwCkBAIC0xNTcs MTQgKzE1NywxOCBAQCBwcm9jIHNlbmRfZ2RiX2Rpc2NhcmQgeyBjb21tYW5k IH0gewogICAgIH0KIH0KIAotcHJvYyBnZXRfbXN5bV9hZGRycyB7IHZhciBt c3ltZmlsZSB9IHsKK3Byb2MgZ2V0X21zeW1fYWRkcnMgeyB2YXIgbXN5bWZp bGUgeyBwbHVzX3ZhciAiIiB9IH0gewogICAgICMgRXh0cmFjdCB0aGUgbGlz dCBvZiB2YWx1ZXMgZm9yIHN5bWJvbHMgbWF0Y2hpbmcgdmFyIGluIHRoZQog ICAgICMgbWluaW1hbCBzeW1ib2wgb3V0cHV0IGZpbGUKIAogICAgIGdsb2Jh bCBnZGJfcHJvbXB0IGhleAogICAgIHNldCByZXN1bHQgIiIKIAotICAgIHNl bmRfZ2RiICJzaGVsbCBncmVwIC1FIFwiICR7dmFyfShcWyBcdFxdKy4qKT9c JFwiICR7bXN5bWZpbGV9XG4iCisgICAgaWYgeyAiJHtwbHVzX3Zhcn0iID09 ICIiIH0geworCXNlbmRfZ2RiICJzaGVsbCBncmVwIC1FIFwiICR7dmFyfShc WyBcdFxdKy4qKT9cJFwiICR7bXN5bWZpbGV9XG4iCisgICAgfSBlbHNlIHsK KwlzZW5kX2dkYiAic2hlbGwgZ3JlcCAtRSBcIiAke3BsdXNfdmFyfSAuKiAk e3Zhcn0oXFsgXHRcXSsuKik/XCRcIiAke21zeW1maWxlfVxuIgorICAgIH0K IAogICAgIHdoaWxlIDEgewogCWdkYl9leHBlY3QgewpAQCAtMjAxLDEwICsy MDUsMTAgQEAgcHJvYyBjaGVja19zYW1lIHt2YXIgbXN5bWZpbGV9IHsKICAg ICB9CiB9CiAKLXByb2MgY2hlY2tfZGlmZmVyZW50IHt2YXIgbXN5bWZpbGV9 IHsKK3Byb2MgY2hlY2tfZGlmZmVyZW50IHt2YXIgbXN5bWZpbGUgeyBwbHVz X3ZhciAiIiB9IH0gewogICAgICMgQ2hlY2sgdGhhdCB0aGUgbWluaW1hbCBz eW1ib2wgdmFsdWVzIG1hdGNoaW5nIHZhciBhcmUgZGlmZmVyZW50CiAKLSAg ICBzZXQgYWRkcl9saXN0IFtsc29ydCBbZ2V0X21zeW1fYWRkcnMgIiR7dmFy fSIgIiR7bXN5bWZpbGV9Il1dCisgICAgc2V0IGFkZHJfbGlzdCBbbHNvcnQg W2dldF9tc3ltX2FkZHJzICIke3Zhcn0iICIke21zeW1maWxlfSIgIiR7cGx1 c192YXJ9Il1dCiAgICAgc2V0IHByZXYgIiIKIAogICAgIGlmIHsgW2xsZW5n dGggJHthZGRyX2xpc3R9XSA8IDIgfSB7CkBAIC0yMzYsNyArMjQwLDkgQEAg aWYgW3NlbmRfZ2RiX2Rpc2NhcmQgIm1haW50IHByaW50IG1zeW1ibwogCWZh aWwgIihtc3ltYm9sKSByZWxvY2F0ZWQgZXh0ZXJuIHZhcnMgaGF2ZSBkaWZm ZXJlbnQgYWRkcmVzc2VzIgogICAgIH0KIAotICAgIGlmIHtbY2hlY2tfZGlm ZmVyZW50ICJmbl9cWzEyXF0iICIke21zeW1maWxlfSJdfSB7CisgICAgIyBN c3ltYm9sIHR5cGUgb2YgInJlbG9jYXRlZCBmdW5jdGlvbiIgc2hvdWxkIGJl ICdUJywgc28gd2UganVzdAorICAgICMgY2hlY2sgJ1QnIHR5cGUuCisgICAg aWYge1tjaGVja19kaWZmZXJlbnQgImZuX1xbMTJcXSIgIiR7bXN5bWZpbGV9 IiAiVCJdfSB7CiAJcGFzcyAiKG1zeW1ib2wpIHJlbG9jYXRlZCBmdW5jdGlv bnMgaGF2ZSBkaWZmZXJlbnQgYWRkcmVzc2VzIgogICAgIH0gZWxzZSB7CiAJ ZmFpbCAiKG1zeW1ib2wpIHJlbG9jYXRlZCBmdW5jdGlvbnMgaGF2ZSBkaWZm ZXJlbnQgYWRkcmVzc2VzIgo= --------------080400060404060006080200--