From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MRkvf-0003k8-LQ for qemu-devel@nongnu.org; Fri, 17 Jul 2009 06:44:39 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MRkve-0003ja-PV for qemu-devel@nongnu.org; Fri, 17 Jul 2009 06:44:39 -0400 Received: from [199.232.76.173] (port=36833 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MRkve-0003jM-Jh for qemu-devel@nongnu.org; Fri, 17 Jul 2009 06:44:38 -0400 Received: from fg-out-1718.google.com ([72.14.220.159]:14918) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MRkvd-0003WD-Vd for qemu-devel@nongnu.org; Fri, 17 Jul 2009 06:44:38 -0400 Received: by fg-out-1718.google.com with SMTP id l27so131766fgb.8 for ; Fri, 17 Jul 2009 03:44:35 -0700 (PDT) MIME-Version: 1.0 Date: Fri, 17 Jul 2009 12:44:35 +0200 Message-ID: <761ea48b0907170344s40747659n6f648c27b5a325c8@mail.gmail.com> From: Laurent Desnogues Content-Type: multipart/mixed; boundary=000e0cd29f1e6c5867046ee4798b Subject: [Qemu-devel] [PATCH] ELF coredump List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org --000e0cd29f1e6c5867046ee4798b Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hello, while trying to cross-compile QEMU for ARM as host, I found that elf_greg_t and some other types were already defined by the include files of my cross-compiler (CSL 2009q1-203). The attached patch fixes the issue. Laurent Signed-off-by: Laurent Desnogues PS: Riku and Mika this is the exact same patch I already sent you. --000e0cd29f1e6c5867046ee4798b Content-Type: application/octet-stream; name="elfload.patch" Content-Disposition: attachment; filename="elfload.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fwy0pkl10 ZGlmZiAtLWdpdCBhL2xpbnV4LXVzZXIvZWxmbG9hZC5jIGIvbGludXgtdXNlci9lbGZsb2FkLmMK aW5kZXggZDMxY2NhNy4uMDYzNjg1NSAxMDA2NDQKLS0tIGEvbGludXgtdXNlci9lbGZsb2FkLmMK KysrIGIvbGludXgtdXNlci9lbGZsb2FkLmMKQEAgLTEzNCwxMyArMTM0LDEzIEBAIHN0YXRpYyBp bmxpbmUgdm9pZCBpbml0X3RocmVhZChzdHJ1Y3QgdGFyZ2V0X3B0X3JlZ3MgKnJlZ3MsIHN0cnVj dCBpbWFnZV9pbmZvICppCiAgICAgcmVncy0+cmlwID0gaW5mb3AtPmVudHJ5OwogfQogCi10eXBl ZGVmIHRhcmdldF91bG9uZyAgICBlbGZfZ3JlZ190OwordHlwZWRlZiB0YXJnZXRfdWxvbmcgICAg dGFyZ2V0X2VsZl9ncmVnX3Q7CiB0eXBlZGVmIHVpbnQzMl90ICAgICAgICB0YXJnZXRfdWlkX3Q7 CiB0eXBlZGVmIHVpbnQzMl90ICAgICAgICB0YXJnZXRfZ2lkX3Q7CiB0eXBlZGVmIGludDMyX3Qg ICAgICAgICB0YXJnZXRfcGlkX3Q7CiAKICNkZWZpbmUgRUxGX05SRUcgICAgMjcKLXR5cGVkZWYg ZWxmX2dyZWdfdCAgZWxmX2dyZWdzZXRfdFtFTEZfTlJFR107Cit0eXBlZGVmIHRhcmdldF9lbGZf Z3JlZ190ICB0YXJnZXRfZWxmX2dyZWdzZXRfdFtFTEZfTlJFR107CiAKIC8qCiAgKiBOb3RlIHRo YXQgRUxGX05SRUcgc2hvdWxkIGJlIDI5IGFzIHRoZXJlIHNob3VsZCBiZSBwbGFjZSBmb3IKQEAg LTE0OSw3ICsxNDksNyBAQCB0eXBlZGVmIGVsZl9ncmVnX3QgIGVsZl9ncmVnc2V0X3RbRUxGX05S RUddOwogICoKICAqIFNlZSBsaW51eCBrZXJuZWw6IGFyY2gveDg2L2luY2x1ZGUvYXNtL2VsZi5o CiAgKi8KLXN0YXRpYyB2b2lkIGVsZl9jb3JlX2NvcHlfcmVncyhlbGZfZ3JlZ3NldF90ICpyZWdz LCBjb25zdCBDUFVTdGF0ZSAqZW52KQorc3RhdGljIHZvaWQgZWxmX2NvcmVfY29weV9yZWdzKHRh cmdldF9lbGZfZ3JlZ3NldF90ICpyZWdzLCBjb25zdCBDUFVTdGF0ZSAqZW52KQogewogICAgICgq cmVncylbMF0gPSBlbnYtPnJlZ3NbMTVdOwogICAgICgqcmVncylbMV0gPSBlbnYtPnJlZ3NbMTRd OwpAQCAtMjExLDEzICsyMTEsMTMgQEAgc3RhdGljIGlubGluZSB2b2lkIGluaXRfdGhyZWFkKHN0 cnVjdCB0YXJnZXRfcHRfcmVncyAqcmVncywgc3RydWN0IGltYWdlX2luZm8gKmkKICAgICByZWdz LT5lZHggPSAwOwogfQogCi10eXBlZGVmIHRhcmdldF91bG9uZyAgICBlbGZfZ3JlZ190OwordHlw ZWRlZiB0YXJnZXRfdWxvbmcgICAgdGFyZ2V0X2VsZl9ncmVnX3Q7CiB0eXBlZGVmIHVpbnQxNl90 ICAgICAgICB0YXJnZXRfdWlkX3Q7CiB0eXBlZGVmIHVpbnQxNl90ICAgICAgICB0YXJnZXRfZ2lk X3Q7CiB0eXBlZGVmIGludDMyX3QgICAgICAgICB0YXJnZXRfcGlkX3Q7CiAKICNkZWZpbmUgRUxG X05SRUcgICAgMTcKLXR5cGVkZWYgZWxmX2dyZWdfdCAgZWxmX2dyZWdzZXRfdFtFTEZfTlJFR107 Cit0eXBlZGVmIHRhcmdldF9lbGZfZ3JlZ190ICB0YXJnZXRfZWxmX2dyZWdzZXRfdFtFTEZfTlJF R107CiAKIC8qCiAgKiBOb3RlIHRoYXQgRUxGX05SRUcgc2hvdWxkIGJlIDE5IGFzIHRoZXJlIHNo b3VsZCBiZSBwbGFjZSBmb3IKQEAgLTIyNiw3ICsyMjYsNyBAQCB0eXBlZGVmIGVsZl9ncmVnX3Qg IGVsZl9ncmVnc2V0X3RbRUxGX05SRUddOwogICoKICAqIFNlZSBsaW51eCBrZXJuZWw6IGFyY2gv eDg2L2luY2x1ZGUvYXNtL2VsZi5oCiAgKi8KLXN0YXRpYyB2b2lkIGVsZl9jb3JlX2NvcHlfcmVn cyhlbGZfZ3JlZ3NldF90ICpyZWdzLCBjb25zdCBDUFVTdGF0ZSAqZW52KQorc3RhdGljIHZvaWQg ZWxmX2NvcmVfY29weV9yZWdzKHRhcmdldF9lbGZfZ3JlZ3NldF90ICpyZWdzLCBjb25zdCBDUFVT dGF0ZSAqZW52KQogewogICAgICgqcmVncylbMF0gPSBlbnYtPnJlZ3NbUl9FQlhdOwogICAgICgq cmVncylbMV0gPSBlbnYtPnJlZ3NbUl9FQ1hdOwpAQCAtMjg2LDE1ICsyODYsMTUgQEAgc3RhdGlj IGlubGluZSB2b2lkIGluaXRfdGhyZWFkKHN0cnVjdCB0YXJnZXRfcHRfcmVncyAqcmVncywgc3Ry dWN0IGltYWdlX2luZm8gKmkKICAgICByZWdzLT5BUk1fcjEwID0gaW5mb3AtPnN0YXJ0X2RhdGE7 CiB9CiAKLXR5cGVkZWYgdWludDMyX3QgZWxmX2dyZWdfdDsKK3R5cGVkZWYgdWludDMyX3QgdGFy Z2V0X2VsZl9ncmVnX3Q7CiB0eXBlZGVmIHVpbnQxNl90IHRhcmdldF91aWRfdDsKIHR5cGVkZWYg dWludDE2X3QgdGFyZ2V0X2dpZF90OwogdHlwZWRlZiBpbnQzMl90ICB0YXJnZXRfcGlkX3Q7CiAK ICNkZWZpbmUgRUxGX05SRUcgICAgMTgKLXR5cGVkZWYgZWxmX2dyZWdfdCAgZWxmX2dyZWdzZXRf dFtFTEZfTlJFR107Cit0eXBlZGVmIHRhcmdldF9lbGZfZ3JlZ190ICB0YXJnZXRfZWxmX2dyZWdz ZXRfdFtFTEZfTlJFR107CiAKLXN0YXRpYyB2b2lkIGVsZl9jb3JlX2NvcHlfcmVncyhlbGZfZ3Jl Z3NldF90ICpyZWdzLCBjb25zdCBDUFVTdGF0ZSAqZW52KQorc3RhdGljIHZvaWQgZWxmX2NvcmVf Y29weV9yZWdzKHRhcmdldF9lbGZfZ3JlZ3NldF90ICpyZWdzLCBjb25zdCBDUFVTdGF0ZSAqZW52 KQogewogICAgICgqcmVncylbMF0gPSBlbnYtPnJlZ3NbMF07CiAgICAgKCpyZWdzKVsxXSA9IGVu di0+cmVnc1sxXTsKQEAgLTE3NzksMTQgKzE3NzksMTQgQEAgc3RydWN0IG1lbWVsZm5vdGUgewog ICAgIHNpemVfdCAgICAgbm90ZXN6OwogfTsKIAotc3RydWN0IGVsZl9zaWdpbmZvIHsKK3N0cnVj dCB0YXJnZXRfZWxmX3NpZ2luZm8gewogICAgIGludCAgc2lfc2lnbm87IC8qIHNpZ25hbCBudW1i ZXIgKi8KICAgICBpbnQgIHNpX2NvZGU7ICAvKiBleHRyYSBjb2RlICovCiAgICAgaW50ICBzaV9l cnJubzsgLyogZXJybm8gKi8KIH07CiAKLXN0cnVjdCBlbGZfcHJzdGF0dXMgewotICAgIHN0cnVj dCBlbGZfc2lnaW5mbyBwcl9pbmZvOyAgICAgIC8qIEluZm8gYXNzb2NpYXRlZCB3aXRoIHNpZ25h bCAqLworc3RydWN0IHRhcmdldF9lbGZfcHJzdGF0dXMgeworICAgIHN0cnVjdCB0YXJnZXRfZWxm X3NpZ2luZm8gcHJfaW5mbzsgICAgICAvKiBJbmZvIGFzc29jaWF0ZWQgd2l0aCBzaWduYWwgKi8K ICAgICBzaG9ydCAgICAgICAgICAgICAgcHJfY3Vyc2lnOyAgICAvKiBDdXJyZW50IHNpZ25hbCAq LwogICAgIHRhcmdldF91bG9uZyAgICAgICBwcl9zaWdwZW5kOyAgIC8qIFhYWCAqLwogICAgIHRh cmdldF91bG9uZyAgICAgICBwcl9zaWdob2xkOyAgIC8qIFhYWCAqLwpAQCAtMTc5OCwxMyArMTc5 OCwxMyBAQCBzdHJ1Y3QgZWxmX3Byc3RhdHVzIHsKICAgICBzdHJ1Y3QgdGFyZ2V0X3RpbWV2YWwg cHJfc3RpbWU7ICAvKiBYWFggU3lzdGVtIHRpbWUgKi8KICAgICBzdHJ1Y3QgdGFyZ2V0X3RpbWV2 YWwgcHJfY3V0aW1lOyAvKiBYWFggQ3VtdWxhdGl2ZSB1c2VyIHRpbWUgKi8KICAgICBzdHJ1Y3Qg dGFyZ2V0X3RpbWV2YWwgcHJfY3N0aW1lOyAvKiBYWFggQ3VtdWxhdGl2ZSBzeXN0ZW0gdGltZSAq LwotICAgIGVsZl9ncmVnc2V0X3QgICAgICBwcl9yZWc7ICAgICAgIC8qIEdQIHJlZ2lzdGVycyAq LworICAgIHRhcmdldF9lbGZfZ3JlZ3NldF90ICAgICAgcHJfcmVnOyAgICAgICAvKiBHUCByZWdp c3RlcnMgKi8KICAgICBpbnQgICAgICAgICAgICAgICAgcHJfZnB2YWxpZDsgICAvKiBYWFggKi8K IH07CiAKICNkZWZpbmUgRUxGX1BSQVJHU1ogICAgICg4MCkgLyogTnVtYmVyIG9mIGNoYXJzIGZv ciBhcmdzICovCiAKLXN0cnVjdCBlbGZfcHJwc2luZm8geworc3RydWN0IHRhcmdldF9lbGZfcHJw c2luZm8gewogICAgIGNoYXIgICAgICAgICBwcl9zdGF0ZTsgICAgICAgLyogbnVtZXJpYyBwcm9j ZXNzIHN0YXRlICovCiAgICAgY2hhciAgICAgICAgIHByX3NuYW1lOyAgICAgICAvKiBjaGFyIGZv ciBwcl9zdGF0ZSAqLwogICAgIGNoYXIgICAgICAgICBwcl96b21iOyAgICAgICAgLyogem9tYmll ICovCkBAIC0xODIxLDcgKzE4MjEsNyBAQCBzdHJ1Y3QgZWxmX3BycHNpbmZvIHsKIC8qIEhlcmUg aXMgdGhlIHN0cnVjdHVyZSBpbiB3aGljaCBzdGF0dXMgb2YgZWFjaCB0aHJlYWQgaXMgY2FwdHVy ZWQuICovCiBzdHJ1Y3QgZWxmX3RocmVhZF9zdGF0dXMgewogICAgIFRBSUxRX0VOVFJZKGVsZl90 aHJlYWRfc3RhdHVzKSAgZXRzX2xpbms7Ci0gICAgc3RydWN0IGVsZl9wcnN0YXR1cyBwcnN0YXR1 czsgICAvKiBOVF9QUlNUQVRVUyAqLworICAgIHN0cnVjdCB0YXJnZXRfZWxmX3Byc3RhdHVzIHBy c3RhdHVzOyAgIC8qIE5UX1BSU1RBVFVTICovCiAjaWYgMAogICAgIGVsZl9mcHJlZ3NldF90IGZw dTsgICAgICAgICAgICAgLyogTlRfUFJGUFJFRyAqLwogICAgIHN0cnVjdCB0YXNrX3N0cnVjdCAq dGhyZWFkOwpAQCAtMTgzMyw4ICsxODMzLDggQEAgc3RydWN0IGVsZl90aHJlYWRfc3RhdHVzIHsK IAogc3RydWN0IGVsZl9ub3RlX2luZm8gewogICAgIHN0cnVjdCBtZW1lbGZub3RlICAgKm5vdGVz OwotICAgIHN0cnVjdCBlbGZfcHJzdGF0dXMgKnByc3RhdHVzOyAgLyogTlRfUFJTVEFUVVMgKi8K LSAgICBzdHJ1Y3QgZWxmX3BycHNpbmZvICpwc2luZm87ICAgIC8qIE5UX1BSUFNJTkZPICovCisg ICAgc3RydWN0IHRhcmdldF9lbGZfcHJzdGF0dXMgKnByc3RhdHVzOyAgLyogTlRfUFJTVEFUVVMg Ki8KKyAgICBzdHJ1Y3QgdGFyZ2V0X2VsZl9wcnBzaW5mbyAqcHNpbmZvOyAgICAvKiBOVF9QUlBT SU5GTyAqLwogCiAgICAgVEFJTFFfSEVBRCh0aHJlYWRfbGlzdF9oZWFkLCBlbGZfdGhyZWFkX3N0 YXR1cykgdGhyZWFkX2xpc3Q7CiAjaWYgMApAQCAtMTg3Niw4ICsxODc2LDggQEAgc3RhdGljIGlu dCB2bWFfd2Fsa2VyKHZvaWQgKnByaXYsIHVuc2lnbmVkIGxvbmcgc3RhcnQsIHVuc2lnbmVkIGxv bmcgZW5kLAogc3RhdGljIHZvaWQgZmlsbF9lbGZfaGVhZGVyKHN0cnVjdCBlbGZoZHIgKiwgaW50 LCB1aW50MTZfdCwgdWludDMyX3QpOwogc3RhdGljIHZvaWQgZmlsbF9ub3RlKHN0cnVjdCBtZW1l bGZub3RlICosIGNvbnN0IGNoYXIgKiwgaW50LAogICAgIHVuc2lnbmVkIGludCwgdm9pZCAqKTsK LXN0YXRpYyB2b2lkIGZpbGxfcHJzdGF0dXMoc3RydWN0IGVsZl9wcnN0YXR1cyAqLCBjb25zdCBU YXNrU3RhdGUgKiwgaW50KTsKLXN0YXRpYyBpbnQgZmlsbF9wc2luZm8oc3RydWN0IGVsZl9wcnBz aW5mbyAqLCBjb25zdCBUYXNrU3RhdGUgKik7CitzdGF0aWMgdm9pZCBmaWxsX3Byc3RhdHVzKHN0 cnVjdCB0YXJnZXRfZWxmX3Byc3RhdHVzICosIGNvbnN0IFRhc2tTdGF0ZSAqLCBpbnQpOworc3Rh dGljIGludCBmaWxsX3BzaW5mbyhzdHJ1Y3QgdGFyZ2V0X2VsZl9wcnBzaW5mbyAqLCBjb25zdCBU YXNrU3RhdGUgKik7CiBzdGF0aWMgdm9pZCBmaWxsX2F1eHZfbm90ZShzdHJ1Y3QgbWVtZWxmbm90 ZSAqLCBjb25zdCBUYXNrU3RhdGUgKik7CiBzdGF0aWMgdm9pZCBmaWxsX2VsZl9ub3RlX3BoZHIo c3RydWN0IGVsZl9waGRyICosIGludCwgb2ZmX3QpOwogc3RhdGljIHNpemVfdCBub3RlX3NpemUo Y29uc3Qgc3RydWN0IG1lbWVsZm5vdGUgKik7CkBAIC0xODkxLDEwICsxODkxLDEwIEBAIHN0YXRp YyBpbnQgd3JpdGVfbm90ZShzdHJ1Y3QgbWVtZWxmbm90ZSAqLCBpbnQpOwogc3RhdGljIGludCB3 cml0ZV9ub3RlX2luZm8oc3RydWN0IGVsZl9ub3RlX2luZm8gKiwgaW50KTsKIAogI2lmZGVmIEJT V0FQX05FRURFRAotc3RhdGljIHZvaWQgYnN3YXBfcHJzdGF0dXMoc3RydWN0IGVsZl9wcnN0YXR1 cyAqKTsKLXN0YXRpYyB2b2lkIGJzd2FwX3BzaW5mbyhzdHJ1Y3QgZWxmX3BycHNpbmZvICopOwor c3RhdGljIHZvaWQgYnN3YXBfcHJzdGF0dXMoc3RydWN0IHRhcmdldF9lbGZfcHJzdGF0dXMgKik7 CitzdGF0aWMgdm9pZCBic3dhcF9wc2luZm8oc3RydWN0IHRhcmdldF9lbGZfcHJwc2luZm8gKik7 CiAKLXN0YXRpYyB2b2lkIGJzd2FwX3Byc3RhdHVzKHN0cnVjdCBlbGZfcHJzdGF0dXMgKnByc3Rh dHVzKQorc3RhdGljIHZvaWQgYnN3YXBfcHJzdGF0dXMoc3RydWN0IHRhcmdldF9lbGZfcHJzdGF0 dXMgKnByc3RhdHVzKQogewogICAgIHByc3RhdHVzLT5wcl9pbmZvLnNpX3NpZ25vID0gdHN3YXBs KHByc3RhdHVzLT5wcl9pbmZvLnNpX3NpZ25vKTsKICAgICBwcnN0YXR1cy0+cHJfaW5mby5zaV9j b2RlID0gdHN3YXBsKHByc3RhdHVzLT5wcl9pbmZvLnNpX2NvZGUpOwpAQCAtMTkxMSw3ICsxOTEx LDcgQEAgc3RhdGljIHZvaWQgYnN3YXBfcHJzdGF0dXMoc3RydWN0IGVsZl9wcnN0YXR1cyAqcHJz dGF0dXMpCiAgICAgcHJzdGF0dXMtPnByX2ZwdmFsaWQgPSB0c3dhcDMyKHByc3RhdHVzLT5wcl9m cHZhbGlkKTsKIH0KIAotc3RhdGljIHZvaWQgYnN3YXBfcHNpbmZvKHN0cnVjdCBlbGZfcHJwc2lu Zm8gKnBzaW5mbykKK3N0YXRpYyB2b2lkIGJzd2FwX3BzaW5mbyhzdHJ1Y3QgdGFyZ2V0X2VsZl9w cnBzaW5mbyAqcHNpbmZvKQogewogICAgIHBzaW5mby0+cHJfZmxhZyA9IHRzd2FwbChwc2luZm8t PnByX2ZsYWcpOwogICAgIHBzaW5mby0+cHJfdWlkID0gdHN3YXAxNihwc2luZm8tPnByX3VpZCk7 CkBAIC0yMTA1LDcgKzIxMDUsNyBAQCBzdGF0aWMgc2l6ZV90IG5vdGVfc2l6ZShjb25zdCBzdHJ1 Y3QgbWVtZWxmbm90ZSAqbm90ZSkKICAgICByZXR1cm4gKG5vdGUtPm5vdGVzeik7CiB9CiAKLXN0 YXRpYyB2b2lkIGZpbGxfcHJzdGF0dXMoc3RydWN0IGVsZl9wcnN0YXR1cyAqcHJzdGF0dXMsCitz dGF0aWMgdm9pZCBmaWxsX3Byc3RhdHVzKHN0cnVjdCB0YXJnZXRfZWxmX3Byc3RhdHVzICpwcnN0 YXR1cywKICAgICBjb25zdCBUYXNrU3RhdGUgKnRzLCBpbnQgc2lnbnIpCiB7CiAgICAgKHZvaWQp IG1lbXNldChwcnN0YXR1cywgMCwgc2l6ZW9mICgqcHJzdGF0dXMpKTsKQEAgLTIxMjAsNyArMjEy MCw3IEBAIHN0YXRpYyB2b2lkIGZpbGxfcHJzdGF0dXMoc3RydWN0IGVsZl9wcnN0YXR1cyAqcHJz dGF0dXMsCiAjZW5kaWYKIH0KIAotc3RhdGljIGludCBmaWxsX3BzaW5mbyhzdHJ1Y3QgZWxmX3By cHNpbmZvICpwc2luZm8sIGNvbnN0IFRhc2tTdGF0ZSAqdHMpCitzdGF0aWMgaW50IGZpbGxfcHNp bmZvKHN0cnVjdCB0YXJnZXRfZWxmX3BycHNpbmZvICpwc2luZm8sIGNvbnN0IFRhc2tTdGF0ZSAq dHMpCiB7CiAgICAgY2hhciAqZmlsZW5hbWUsICpiYXNlX2ZpbGVuYW1lOwogICAgIHVuc2lnbmVk IGludCBpLCBsZW47Cg== --000e0cd29f1e6c5867046ee4798b--