From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from kirsty.vergenet.net ([202.4.237.240]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1OCBqA-0000s6-6L for kexec@lists.infradead.org; Wed, 12 May 2010 13:19:11 +0000 Date: Wed, 12 May 2010 22:19:03 +0900 From: Simon Horman Subject: Re: [PATCH 1/2] Fix kexec on powerpc32 Message-ID: <20100512131902.GA8109@verge.net.au> References: <20100511174749.19309.44615.stgit@muvarov> <4BEA2375.7040802@nerdbynature.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: kexec-bounces@lists.infradead.org Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: Maxim Uvarov Cc: Christian Kujau , linuxppc-dev@lists.ozlabs.org, kexec@lists.infradead.org T24gV2VkLCBNYXkgMTIsIDIwMTAgYXQgMTA6MzE6MjZBTSArMDQwMCwgTWF4aW0gVXZhcm92IHdy b3RlOgo+IDIwMTAvNS8xMiBDaHJpc3RpYW4gS3VqYXUgPGxpc3RzQG5lcmRieW5hdHVyZS5kZT4K PiAKPiA+IE1heGltIFV2YXJvdiB3cm90ZSBvbiAyMDEwLTA1LTExIDEwOjQ3IDoKPiA+ID4gVGhp cyBwYXRjaCBpcyByZXF1aXJlZCBpbiBjYXNlIGlmIHlvdSBhcmUgdXNpbmcgbmV3IHRvb2xjaGFp bnMuCj4gPgo+ID4gSSdtIG9uIERlYmlhbi9zdGFibGUgKGJpbnV0aWxzIDIuMTgsIGdjYyA0LjMu MiksIHNvIEkgYXBwbGllZCB5b3VyIHBhdGNoZXMKPiA+IHRvIHRoZSBsYXRlc3QgLWdpdCBjaGVj a291dDoKPiA+Cj4gPiBGaXJzdCwgY29tcGlsYXRpb24gZmFpbHMgd2l0aDoKPiA+Cj4gPiBjYzE6 IHdhcm5pbmdzIGJlaW5nIHRyZWF0ZWQgYXMgZXJyb3JzCj4gPiBrZXhlYy9hcmNoL3BwYy9rZXhl Yy1wcGMuYzogSW4gZnVuY3Rpb24g4oCYZ2V0X2Jhc2VfcmFuZ2Vz4oCZOgo+ID4ga2V4ZWMvYXJj aC9wcGMva2V4ZWMtcHBjLmM6MjU4OiBlcnJvcjogdmFsdWUgY29tcHV0ZWQgaXMgbm90IHVzZWQK PiA+IG1ha2U6ICoqKiBba2V4ZWMvYXJjaC9wcGMva2V4ZWMtcHBjLm9dIEVycm9yIDEKPiA+Cj4g PiBTb21laG93IGEgIi0iIGh5cGhlbiBtYWRlIGl0IGludG8gb25lIG9mIHRoZSBmdW5jdGlvbnM6 Cj4gPgo+ID4gPiAtLS0gYS9rZXhlYy9hcmNoL3BwYy9rZXhlYy1wcGMuYwo+ID4gPiArKysgYi9r ZXhlYy9hcmNoL3BwYy9rZXhlYy1wcGMuYwo+ID4gWy4uLl0KPiA+ID4gICAgICAgICAgICAgICAg ICAgICAgIGlmIChsb2NhbF9tZW1vcnlfcmFuZ2VzID49IG1heF9tZW1vcnlfcmFuZ2VzKSB7Cj4g PiA+IC0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZjbG9zZShmaWxlKTsKPiA+ID4gLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Cj4gPiA+ICsgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGlmIChyZWFsbG9jX21lbW9yeV9yYW5nZXMoKSA8IDApewo+ID4gPiArICAg ICAtICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZjbG9zZShmaWxlKTsKPiA+Cj4gPiBP aCwgSSBzZW50IHRoaXMgcGF0Y2ggdHdpY2Ugd2l0aCBzdGcgLWEgYnkgbWlzdGFrZS4gQW5kIHNl Y29uZCB2ZXJzaW9uIGhhcwo+ICItIi4gSSB3aWxsIGZpeCBhbmQgcmVzZW5kIHBhdGNoZXMuCj4g Cj4gPgo+ID4gUmVtb3ZpbmcgdGhpcywgZ2V0cyBtZSBmdXJ0aGVyLCB1bnRpbDoKPiA+Cj4gPgo+ ID4gcHVyZ2F0b3J5L2FyY2gvcHBjL2NydC5vOiBJbiBmdW5jdGlvbiBgX19sc2hyZGkzJzoKPiA+ ICgudGV4dCsweGYwKTogbXVsdGlwbGUgZGVmaW5pdGlvbiBvZiBgX19sc2hyZGkzJwo+ID4gcHVy Z2F0b3J5L2FyY2gvcHBjL21pc2MubzooLnRleHQrMHg1MCk6IGZpcnN0IGRlZmluZWQgaGVyZQo+ ID4gY29sbGVjdDI6IGxkIHJldHVybmVkIDEgZXhpdCBzdGF0dXMKPiA+IG1ha2U6ICoqKiBbcHVy Z2F0b3J5L3B1cmdhdG9yeS5yb10gRXJyb3IgMQo+ID4KPiA+IEFuZCBoYXMgYmVlbiBkZWZpbmVk IGluIHB1cmdhdG9yeS9hcmNoL3BwYy9jcnQuUyBhbmQKPiA+IC4vcHVyZ2F0b3J5L2FyY2gvcHBj L21pc2MuUy4gUmVtb3ZpbmcgaXQgZnJvbSBlLmcuIGNydC5TCj4gPiBtYWtlcyBpdCBjb21waWxl LCBJIGhhdmUgbm90IHRlc3RlZCBpdCB5ZXQsIHRob3VnaCA6LSkKPiA+Cj4gCj4gWWVzLCB0aGF0 IGlzIGV4cGVjdGVkIHJlc3VsdCBmb3Igb2xkIHRvb2wgY2hhaW5zLiBOZXcgdG9vbCBjaGFpbnMg KGZyb20gY29kZQo+IHNvdXJjZXJ5ICkgIG5lZWQgdGhpcyBjcnQuUy4KPiBJIHRoaW5rIHdlIGNh biBoYXZlIC0td2l0aC1vbGR0b29sY2hhaW4gb3B0aW9uIHRvIGNvbmZpZ3VyZSB0byBwb2ludCB0 byBvbGQKPiB0b29sIGNoYWlucy4gKG9yIGV2ZW4gcmVuYW1lIGl0IHRvIC0td2l0aC1jcnRzLAo+ IEkgZG9uJ3Qga25vdyB3aGF0IGlzIGJldHRlci4pCgpJIHRoaW5rIC0td2l0aC1jcnRzIHdvdWxk IGJlIGJldHRlciBhcyAtLXdpdGgtb2xkdG9vbGNoYWluIGNvdWxkCm1lYW4gbWFueSB0aGluZ3Mu CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18Ka2V4ZWMg bWFpbGluZyBsaXN0CmtleGVjQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJh ZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9rZXhlYwo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from kirsty.vergenet.net (kirsty.vergenet.net [202.4.237.240]) by ozlabs.org (Postfix) with ESMTP id B7A0FB7E0E for ; Wed, 12 May 2010 23:37:40 +1000 (EST) Date: Wed, 12 May 2010 22:19:03 +0900 From: Simon Horman To: Maxim Uvarov Subject: Re: [PATCH 1/2] Fix kexec on powerpc32 Message-ID: <20100512131902.GA8109@verge.net.au> References: <20100511174749.19309.44615.stgit@muvarov> <4BEA2375.7040802@nerdbynature.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 In-Reply-To: Cc: Christian Kujau , linuxppc-dev@lists.ozlabs.org, kexec@lists.infradead.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Wed, May 12, 2010 at 10:31:26AM +0400, Maxim Uvarov wrote: > 2010/5/12 Christian Kujau > > > Maxim Uvarov wrote on 2010-05-11 10:47 : > > > This patch is required in case if you are using new toolchains. > > > > I'm on Debian/stable (binutils 2.18, gcc 4.3.2), so I applied your patches > > to the latest -git checkout: > > > > First, compilation fails with: > > > > cc1: warnings being treated as errors > > kexec/arch/ppc/kexec-ppc.c: In function ‘get_base_ranges’: > > kexec/arch/ppc/kexec-ppc.c:258: error: value computed is not used > > make: *** [kexec/arch/ppc/kexec-ppc.o] Error 1 > > > > Somehow a "-" hyphen made it into one of the functions: > > > > > --- a/kexec/arch/ppc/kexec-ppc.c > > > +++ b/kexec/arch/ppc/kexec-ppc.c > > [...] > > > if (local_memory_ranges >= max_memory_ranges) { > > > - fclose(file); > > > - break; > > > + if (realloc_memory_ranges() < 0){ > > > + - fclose(file); > > > > Oh, I sent this patch twice with stg -a by mistake. And second version has > "-". I will fix and resend patches. > > > > > Removing this, gets me further, until: > > > > > > purgatory/arch/ppc/crt.o: In function `__lshrdi3': > > (.text+0xf0): multiple definition of `__lshrdi3' > > purgatory/arch/ppc/misc.o:(.text+0x50): first defined here > > collect2: ld returned 1 exit status > > make: *** [purgatory/purgatory.ro] Error 1 > > > > And has been defined in purgatory/arch/ppc/crt.S and > > ./purgatory/arch/ppc/misc.S. Removing it from e.g. crt.S > > makes it compile, I have not tested it yet, though :-) > > > > Yes, that is expected result for old tool chains. New tool chains (from code > sourcery ) need this crt.S. > I think we can have --with-oldtoolchain option to configure to point to old > tool chains. (or even rename it to --with-crts, > I don't know what is better.) I think --with-crts would be better as --with-oldtoolchain could mean many things.