From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27300 invoked by alias); 2 May 2011 23:16:06 -0000 Received: (qmail 27288 invoked by uid 22791); 2 May 2011 23:16:05 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (216.239.44.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 02 May 2011 23:15:47 +0000 Received: from wpaz13.hot.corp.google.com (wpaz13.hot.corp.google.com [172.24.198.77]) by smtp-out.google.com with ESMTP id p42NFkZ0012099 for ; Mon, 2 May 2011 16:15:46 -0700 Received: from gwaa18 (gwaa18.prod.google.com [10.200.27.18]) by wpaz13.hot.corp.google.com with ESMTP id p42NFjdv031001 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for ; Mon, 2 May 2011 16:15:45 -0700 Received: by gwaa18 with SMTP id a18so2078822gwa.19 for ; Mon, 02 May 2011 16:15:45 -0700 (PDT) MIME-Version: 1.0 Received: by 10.101.190.6 with SMTP id s6mr5476180anp.20.1304378145492; Mon, 02 May 2011 16:15:45 -0700 (PDT) Received: by 10.100.131.8 with HTTP; Mon, 2 May 2011 16:15:45 -0700 (PDT) Date: Mon, 02 May 2011 23:16:00 -0000 Message-ID: Subject: [gold patch] Incremental 20/22: Fix problem caused by realignment of data segment From: Cary Coutant To: Ian Lance Taylor , Binutils Content-Type: multipart/mixed; boundary=00163691fc2d03cea404a253340b X-System-Of-Record: true X-IsSubscribed: yes Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org X-SW-Source: 2011-05/txt/msg00017.txt.bz2 --00163691fc2d03cea404a253340b Content-Type: text/plain; charset=ISO-8859-1 Content-length: 827 This patch fixes a problem with the TLS segment caused by realignment of the data segment during the initial incremental-full link. When we do a subsequent incremental-update, the initial attempt to assign addresses to the data segment doesn't match the fixed layout, and we end up with out-of-sync addresses. I avoid this issue simply by keeping the original layout for --incremental-full. Part of the problem was also some old code under a FIXME that ought to have been removed in one of the earlier patches, but I didn't notice that when I was rearranging all my git commits. OK? -cary 2011-05-02 Cary Coutant * layout.cc (Layout::set_segment_offsets): Don't adjust layout for incremental links. * output.cc (Output_segment::set_section_list_addresses): Remove FIXME and test for TLS or BSS. --00163691fc2d03cea404a253340b Content-Type: text/plain; charset=US-ASCII; name="incr-patch-20.txt" Content-Disposition: attachment; filename="incr-patch-20.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gn80udw20 Content-length: 1973 U3VwcHJlc3MgcmVhbGlnbm1lbnQgb2YgZGF0YSBzZWdtZW50IGZvciBpbmNy ZW1lbnRhbCBsaW5rcywgYW5kCmZpeCBoYW5kbGluZyBvZiBUTFMgYW5kIEJT UyBzZWN0aW9ucyBkdXJpbmcgaW5jcmVtZW50YWwgdXBkYXRlLgoKCjIwMTEt MDUtMDIgQ2FyeSBDb3V0YW50ICA8Y2NvdXRhbnRAZ29vZ2xlLmNvbT4KCgkq IGxheW91dC5jYyAoTGF5b3V0OjpzZXRfc2VnbWVudF9vZmZzZXRzKTogRG9u J3QgYWRqdXN0IGxheW91dAoJZm9yIGluY3JlbWVudGFsIGxpbmtzLgoJKiBv dXRwdXQuY2MgKE91dHB1dF9zZWdtZW50OjpzZXRfc2VjdGlvbl9saXN0X2Fk ZHJlc3Nlcyk6IFJlbW92ZQoJRklYTUUgYW5kIHRlc3QgZm9yIFRMUyBvciBC U1MuCgoKZGlmZiAtLWdpdCBhL2dvbGQvbGF5b3V0LmNjIGIvZ29sZC9sYXlv dXQuY2MKaW5kZXggNjdlZDhjMy4uNTM3NjUxYSAxMDA2NDQKLS0tIGEvZ29s ZC9sYXlvdXQuY2MKKysrIGIvZ29sZC9sYXlvdXQuY2MKQEAgLTI5NDUsNyAr Mjk0NSw3IEBAIExheW91dDo6c2V0X3NlZ21lbnRfb2Zmc2V0cyhjb25zdCBU YXJnZXQqIHRhcmdldCwgT3V0cHV0X3NlZ21lbnQqIGxvYWRfc2VnLAogCSAg aWYgKCFhcmVfYWRkcmVzc2VzX3NldAogCSAgICAgICYmICFoYXNfcmVscm8K IAkgICAgICAmJiBhbGlnbmVkX2FkZHIgIT0gYWRkcgotCSAgICAgICYmICFw YXJhbWV0ZXJzLT5pbmNyZW1lbnRhbF91cGRhdGUoKSkKKwkgICAgICAmJiAh cGFyYW1ldGVycy0+aW5jcmVtZW50YWwoKSkKIAkgICAgewogCSAgICAgIHVp bnQ2NF90IGZpcnN0X29mZiA9IChjb21tb25fcGFnZXNpemUKIAkJCQkgICAg LSAoYWxpZ25lZF9hZGRyCmRpZmYgLS1naXQgYS9nb2xkL291dHB1dC5jYyBi L2dvbGQvb3V0cHV0LmNjCmluZGV4IDgzMjQyOGUuLjhlODFiMDcgMTAwNjQ0 Ci0tLSBhL2dvbGQvb3V0cHV0LmNjCisrKyBiL2dvbGQvb3V0cHV0LmNjCkBA IC00MDM2LDEwICs0MDM2LDcgQEAgT3V0cHV0X3NlZ21lbnQ6OnNldF9zZWN0 aW9uX2xpc3RfYWRkcmVzc2VzKExheW91dCogbGF5b3V0LCBib29sIHJlc2V0 LAogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KIAotCSAgLy8g RklYTUU6IE5lZWQgdG8gaGFuZGxlIFRMUyBhbmQgLmJzcyB3aXRoIGluY3Jl bWVudGFsIHVwZGF0ZS4KLQkgIGlmICghcGFyYW1ldGVycy0+aW5jcmVtZW50 YWxfdXBkYXRlKCkKLQkgICAgICB8fCAoKnApLT5pc19zZWN0aW9uX2ZsYWdf c2V0KGVsZmNwcDo6U0hGX1RMUykKLQkgICAgICB8fCAoKnApLT5pc19zZWN0 aW9uX3R5cGUoZWxmY3BwOjpTSFRfTk9CSVRTKSkKKwkgIGlmICghcGFyYW1l dGVycy0+aW5jcmVtZW50YWxfdXBkYXRlKCkpCiAJICAgIHsKIAkgICAgICBv ZmYgPSBhbGlnbl9hZGRyZXNzKG9mZiwgYWxpZ24pOwogCSAgICAgICgqcCkt PnNldF9hZGRyZXNzX2FuZF9maWxlX29mZnNldChhZGRyICsgKG9mZiAtIHN0 YXJ0b2ZmKSwgb2ZmKTsK --00163691fc2d03cea404a253340b--