204610 2008-01-06 15:50 0000 dev-libs/elfutils-0.131 -std=gnu99 inline issues 2008-05-07 11:38:13 0000 1 1 1 Unclassified Gentoo Linux GCC Porting unspecified All Linux RESOLVED FIXED P2 normal --- 198121 1 dirtyepic@gentoo.org toolchain@gentoo.org pva@gentoo.org dirtyepic@gentoo.org 2008-01-06 15:50:27 0000 elfutils fails to build with GCC 4.3 due to the whole c99/gnu99 inline conflict thing. i'll attach a patch that works for me, but i don't know if there's a better way to fix it. dirtyepic@gentoo.org 2008-01-06 16:24:14 0000 Created an attachment (id=140287) elfutils-0.131-gcc-4.3-inline.patch vapier@gentoo.org 2008-04-20 08:13:17 0000 should be fixed with elfutils-0.131-r2 vapier@gentoo.org 2008-04-20 19:38:52 0000 *** Bug 218627 has been marked as a duplicate of this bug. *** clayne@anodized.com 2008-05-07 11:38:13 0000 elfutils-0.131-r2 works for me as well. 140287 2008-01-06 16:24 0000 elfutils-0.131-gcc-4.3-inline.patch elfutils-0.131-gcc-4.3-inline.patch text/plain ZGlmZiAtTmF1ciBlbGZ1dGlscy0wLjEzMS1vcmlnL2JhY2tlbmRzL2lhNjRfcmV0dmFsLmMgZWxm dXRpbHMtMC4xMzEvYmFja2VuZHMvaWE2NF9yZXR2YWwuYwotLS0gZWxmdXRpbHMtMC4xMzEtb3Jp Zy9iYWNrZW5kcy9pYTY0X3JldHZhbC5jCTIwMDctMDktMjcgMTY6MjY6MTAuMDAwMDAwMDAwIC0w NjAwCisrKyBlbGZ1dGlscy0wLjEzMS9iYWNrZW5kcy9pYTY0X3JldHZhbC5jCTIwMDgtMDEtMDYg MDk6NTU6MTQuMDAwMDAwMDAwIC0wNjAwCkBAIC05Niw3ICs5Niw3IEBACiAgICAgIElmIHdlIGZp bmQgYSBkYXR1bSB0aGF0J3Mgbm90IHRoZSBzYW1lIEZQIHR5cGUgYXMgdGhlIGZpcnN0IGRhdHVt LCBwdW50LgogICAgICBJZiB3ZSBjb3VudCBtb3JlIHRoYW4gZWlnaHQgdG90YWwgaG9tb2dlbmVv dXMgRlAgZGF0YSwgcHVudC4gICovCiAKLSAgaW5saW5lIGludCBoZmEgKGNvbnN0IER3YXJmX09w ICpsb2MsIGludCBucmVncykKKyAgX19nbnVfaW5saW5lIGludCBoZmEgKGNvbnN0IER3YXJmX09w ICpsb2MsIGludCBucmVncykKICAgICB7CiAgICAgICBpZiAoZnByZWdzX3VzZWQgPT0gMCkKIAkq bG9jcCA9IGxvYzsKZGlmZiAtTmF1ciBlbGZ1dGlscy0wLjEzMS1vcmlnL2xpYmR3L2R3YXJmX2Vu dHJ5X2JyZWFrcG9pbnRzLmMgZWxmdXRpbHMtMC4xMzEvbGliZHcvZHdhcmZfZW50cnlfYnJlYWtw b2ludHMuYwotLS0gZWxmdXRpbHMtMC4xMzEtb3JpZy9saWJkdy9kd2FyZl9lbnRyeV9icmVha3Bv aW50cy5jCTIwMDctMDYtMDUgMTc6MjM6NDYuMDAwMDAwMDAwIC0wNjAwCisrKyBlbGZ1dGlscy0w LjEzMS9saWJkdy9kd2FyZl9lbnRyeV9icmVha3BvaW50cy5jCTIwMDgtMDEtMDYgMDk6NTk6MzIu MDAwMDAwMDAwIC0wNjAwCkBAIC02NCw3ICs2NCw3IEBACiAgICpia3B0cyA9IE5VTEw7CiAKICAg LyogQWRkIG9uZSBicmVha3BvaW50IGxvY2F0aW9uIHRvIHRoZSByZXN1bHQgdmVjdG9yLiAgKi8K LSAgaW5saW5lIGludCBhZGRfYmtwdCAoRHdhcmZfQWRkciBwYykKKyAgX19nbnVfaW5saW5lIGlu dCBhZGRfYmtwdCAoRHdhcmZfQWRkciBwYykKICAgICB7CiAgICAgICBEd2FyZl9BZGRyICpuZXds aXN0ID0gcmVhbGxvYyAoKmJrcHRzLCArK25ia3B0cyAqIHNpemVvZiBuZXdsaXN0WzBdKTsKICAg ICAgIGlmIChuZXdsaXN0ID09IE5VTEwpCkBAIC04MCw3ICs4MCw3IEBACiAgICAgfQogCiAgIC8q IEZhbGxiYWNrIHJlc3VsdCwgYnJlYWsgYXQgdGhlIGVudHJ5cGMvbG93cGMgdmFsdWUuICAqLwot ICBpbmxpbmUgaW50IGVudHJ5cGNfYmtwdCAodm9pZCkKKyAgX19nbnVfaW5saW5lIGludCBlbnRy eXBjX2JrcHQgKHZvaWQpCiAgICAgewogICAgICAgRHdhcmZfQWRkciBwYzsKICAgICAgIHJldHVy biBJTlRVU0UoZHdhcmZfZW50cnlwYykgKGRpZSwgJnBjKSA8IDAgPyAtMSA6IGFkZF9ia3B0IChw Yyk7CkBAIC0xMDcsNyArMTA3LDcgQEAKICAgLyogU2VhcmNoIGEgY29udGlndW91cyBQQyByYW5n ZSBmb3IgcHJvbG9ndWUtZW5kIG1hcmtlcnMuCiAgICAgIElmIERXQVJGLCBsb29rIGZvciBwcm9w ZXIgbWFya2Vycy4KICAgICAgRmFpbGluZyB0aGF0LCBpZiBBREhPQywgbG9vayBmb3IgdGhlIGFk IGhvYyBjb252ZW50aW9uLiAgKi8KLSAgaW5saW5lIGludCBzZWFyY2hfcmFuZ2UgKER3YXJmX0Fk ZHIgbG93LCBEd2FyZl9BZGRyIGhpZ2gsCisgIF9fZ251X2lubGluZSBpbnQgc2VhcmNoX3Jhbmdl IChEd2FyZl9BZGRyIGxvdywgRHdhcmZfQWRkciBoaWdoLAogCQkJICAgYm9vbCBkd2FyZiwgYm9v bCBhZGhvYykKICAgICB7CiAgICAgICBzaXplX3QgbCA9IDAsIHUgPSBubGluZXM7CmRpZmYgLU5h dXIgZWxmdXRpbHMtMC4xMzEtb3JpZy9saWJkdy9kd2FyZl9nZXRzY29wZXZhci5jIGVsZnV0aWxz LTAuMTMxL2xpYmR3L2R3YXJmX2dldHNjb3BldmFyLmMKLS0tIGVsZnV0aWxzLTAuMTMxLW9yaWcv bGliZHcvZHdhcmZfZ2V0c2NvcGV2YXIuYwkyMDA3LTA2LTA1IDE3OjIzOjQ2LjAwMDAwMDAwMCAt MDYwMAorKysgZWxmdXRpbHMtMC4xMzEvbGliZHcvZHdhcmZfZ2V0c2NvcGV2YXIuYwkyMDA4LTAx LTA2IDEwOjAxOjM1LjAwMDAwMDAwMCAtMDYwMApAQCAtOTMsNyArOTMsNyBAQAogICBzaXplX3Qg bWF0Y2hfZmlsZV9sZW4gPSBtYXRjaF9maWxlID09IE5VTEwgPyAwIDogc3RybGVuIChtYXRjaF9m aWxlKTsKICAgYm9vbCBsYXN0ZmlsZV9tYXRjaGVzID0gZmFsc2U7CiAgIGNvbnN0IGNoYXIgKmxh c3RmaWxlID0gTlVMTDsKLSAgaW5saW5lIGJvb2wgZmlsZV9tYXRjaGVzIChEd2FyZl9GaWxlcyAq ZmlsZXMsIHNpemVfdCBpZHgpCisgIF9fZ251X2lubGluZSBib29sIGZpbGVfbWF0Y2hlcyAoRHdh cmZfRmlsZXMgKmZpbGVzLCBzaXplX3QgaWR4KQogICAgIHsKICAgICAgIGlmIChpZHggPj0gZmls ZXMtPm5maWxlcykKIAlyZXR1cm4gZmFsc2U7CmRpZmYgLU5hdXIgZWxmdXRpbHMtMC4xMzEtb3Jp Zy9saWJkdy9saWJkdy5oIGVsZnV0aWxzLTAuMTMxL2xpYmR3L2xpYmR3LmgKLS0tIGVsZnV0aWxz LTAuMTMxLW9yaWcvbGliZHcvbGliZHcuaAkyMDA3LTExLTExIDEzOjI5OjAwLjAwMDAwMDAwMCAt MDYwMAorKysgZWxmdXRpbHMtMC4xMzEvbGliZHcvbGliZHcuaAkyMDA4LTAxLTA2IDEwOjE3OjA3 LjAwMDAwMDAwMCAtMDYwMApAQCAtNjMzLDYgKzYzMywxMiBAQAogCiAvKiBJbmxpbmUgb3B0aW1p emF0aW9ucy4gICovCiAjaWZkZWYgX19PUFRJTUlaRV9fCisjIGlmIGRlZmluZWQoX19HTlVDX1NU RENfSU5MSU5FX18pIHx8IGRlZmluZWQoX19HTlVDX0dOVV9JTkxJTkVfXykKKyMgIGRlZmluZSBf X2dudV9pbmxpbmUgaW5saW5lIF9fYXR0cmlidXRlX18gKChfX2dudV9pbmxpbmVfXykpCisjIGVs c2UKKyMgIGRlZmluZSBfX2dudV9pbmxpbmUgaW5saW5lCisjIGVuZGlmCisKIC8qIFJldHVybiBh dHRyaWJ1dGUgY29kZSBvZiBnaXZlbiBhdHRyaWJ1dGUuICAqLwogX19saWJkd19leHRlcm5faW5s aW5lIHVuc2lnbmVkIGludAogZHdhcmZfd2hhdGF0dHIgKER3YXJmX0F0dHJpYnV0ZSAqYXR0cikK ZGlmZiAtTmF1ciBlbGZ1dGlscy0wLjEzMS1vcmlnL2xpYmR3L2xpYmR3X3Zpc2l0X3Njb3Blcy5j IGVsZnV0aWxzLTAuMTMxL2xpYmR3L2xpYmR3X3Zpc2l0X3Njb3Blcy5jCi0tLSBlbGZ1dGlscy0w LjEzMS1vcmlnL2xpYmR3L2xpYmR3X3Zpc2l0X3Njb3Blcy5jCTIwMDctMTAtMDMgMDA6MTQ6NDgu MDAwMDAwMDAwIC0wNjAwCisrKyBlbGZ1dGlscy0wLjEzMS9saWJkdy9saWJkd192aXNpdF9zY29w ZXMuYwkyMDA4LTAxLTA2IDEwOjAwOjM1LjAwMDAwMDAwMCAtMDYwMApAQCAtMTA5LDcgKzEwOSw3 IEBACiAgIGlmIChJTlRVU0UoZHdhcmZfY2hpbGQpICgmcm9vdC0+ZGllLCAmY2hpbGQuZGllKSAh PSAwKQogICAgIHJldHVybiAtMTsKIAotICBpbmxpbmUgaW50IHJlY3Vyc2UgKHZvaWQpCisgIF9f Z251X2lubGluZSBpbnQgcmVjdXJzZSAodm9pZCkKICAgICB7CiAgICAgICByZXR1cm4gX19saWJk d192aXNpdF9zY29wZXMgKGRlcHRoICsgMSwgJmNoaWxkLAogCQkJCSAgIHByZXZpc2l0LCBwb3N0 dmlzaXQsIGFyZyk7CmRpZmYgLU5hdXIgZWxmdXRpbHMtMC4xMzEtb3JpZy9saWJkd2ZsL2FyZ3At c3RkLmMgZWxmdXRpbHMtMC4xMzEvbGliZHdmbC9hcmdwLXN0ZC5jCi0tLSBlbGZ1dGlscy0wLjEz MS1vcmlnL2xpYmR3ZmwvYXJncC1zdGQuYwkyMDA3LTA2LTA1IDE3OjIzOjQ2LjAwMDAwMDAwMCAt MDYwMAorKysgZWxmdXRpbHMtMC4xMzEvbGliZHdmbC9hcmdwLXN0ZC5jCTIwMDgtMDEtMDYgMTA6 MDU6MzAuMDAwMDAwMDAwIC0wNjAwCkBAIC0xMDYsNyArMTA2LDcgQEAKIHN0YXRpYyBlcnJvcl90 CiBwYXJzZV9vcHQgKGludCBrZXksIGNoYXIgKmFyZywgc3RydWN0IGFyZ3Bfc3RhdGUgKnN0YXRl KQogewotICBpbmxpbmUgdm9pZCBmYWlsdXJlIChEd2ZsICpkd2ZsLCBpbnQgZXJybnVtLCBjb25z dCBjaGFyICptc2cpCisgIF9fZ251X2lubGluZSB2b2lkIGZhaWx1cmUgKER3ZmwgKmR3ZmwsIGlu dCBlcnJudW0sIGNvbnN0IGNoYXIgKm1zZykKICAgICB7CiAgICAgICBpZiAoZXJybnVtID09IC0x KQogCWFyZ3BfZmFpbHVyZSAoc3RhdGUsIEVYSVRfRkFJTFVSRSwgMCwgIiVzOiAlcyIsCkBAIC0x MTYsNyArMTE2LDcgQEAKICAgICAgIGlmIChkd2ZsICE9IE5VTEwpCiAJZHdmbF9lbmQgKGR3Zmwp OwogICAgIH0KLSAgaW5saW5lIGVycm9yX3QgZmFpbCAoRHdmbCAqZHdmbCwgaW50IGVycm51bSwg Y29uc3QgY2hhciAqbXNnKQorICBfX2dudV9pbmxpbmUgZXJyb3JfdCBmYWlsIChEd2ZsICpkd2Zs LCBpbnQgZXJybnVtLCBjb25zdCBjaGFyICptc2cpCiAgICAgewogICAgICAgZmFpbHVyZSAoZHdm bCwgZXJybnVtLCBtc2cpOwogICAgICAgcmV0dXJuIGVycm51bSA9PSAtMSA/IEVJTyA6IGVycm51 bTsKZGlmZiAtTmF1ciBlbGZ1dGlscy0wLjEzMS1vcmlnL2xpYmR3ZmwvZHdmbF9tb2R1bGVfYWRk cnN5bS5jIGVsZnV0aWxzLTAuMTMxL2xpYmR3ZmwvZHdmbF9tb2R1bGVfYWRkcnN5bS5jCi0tLSBl bGZ1dGlscy0wLjEzMS1vcmlnL2xpYmR3ZmwvZHdmbF9tb2R1bGVfYWRkcnN5bS5jCTIwMDctMDkt MjcgMTY6MjY6MTAuMDAwMDAwMDAwIC0wNjAwCisrKyBlbGZ1dGlscy0wLjEzMS9saWJkd2ZsL2R3 ZmxfbW9kdWxlX2FkZHJzeW0uYwkyMDA4LTAxLTA2IDEwOjA0OjU3LjAwMDAwMDAwMCAtMDYwMApA QCAtNTksNyArNTksNyBAQAogCiAgIC8qIFJldHVybiB0cnVlIGlmZiB3ZSBjb25zaWRlciBBRERS IHRvIGxpZSBpbiB0aGUgc2FtZSBzZWN0aW9uIGFzIFNZTS4gICovCiAgIEdFbGZfV29yZCBhZGRy X3NobmR4ID0gU0hOX1VOREVGOwotICBpbmxpbmUgYm9vbCBzYW1lX3NlY3Rpb24gKGNvbnN0IEdF bGZfU3ltICpzeW0sIEdFbGZfV29yZCBzaG5keCkKKyAgX19nbnVfaW5saW5lIGJvb2wgc2FtZV9z ZWN0aW9uIChjb25zdCBHRWxmX1N5bSAqc3ltLCBHRWxmX1dvcmQgc2huZHgpCiAgICAgewogICAg ICAgLyogRm9yIGFic29sdXRlIHN5bWJvbHMgYW5kIHRoZSBsaWtlLCBvbmx5IG1hdGNoIGV4YWN0 bHkuICAqLwogICAgICAgaWYgKHNobmR4ID49IFNITl9MT1JFU0VSVkUpCmRpZmYgLU5hdXIgZWxm dXRpbHMtMC4xMzEtb3JpZy9saWJkd2ZsL2R3ZmxfbW9kdWxlX2dldHNyY19maWxlLmMgZWxmdXRp bHMtMC4xMzEvbGliZHdmbC9kd2ZsX21vZHVsZV9nZXRzcmNfZmlsZS5jCi0tLSBlbGZ1dGlscy0w LjEzMS1vcmlnL2xpYmR3ZmwvZHdmbF9tb2R1bGVfZ2V0c3JjX2ZpbGUuYwkyMDA3LTA2LTA1IDE3 OjIzOjQ2LjAwMDAwMDAwMCAtMDYwMAorKysgZWxmdXRpbHMtMC4xMzEvbGliZHdmbC9kd2ZsX21v ZHVsZV9nZXRzcmNfZmlsZS5jCTIwMDgtMDEtMDYgMDk6NTM6NTQuMDAwMDAwMDAwIC0wNjAwCkBA IC03OSwxNSArNzksMTUgQEAKIAkgJiYgY3UgIT0gTlVMTAogCSAmJiAoZXJyb3IgPSBfX2xpYmR3 ZmxfY3VfZ2V0c3JjbGluZXMgKGN1KSkgPT0gRFdGTF9FX05PRVJST1IpCiAgICAgewotICAgICAg aW5saW5lIGNvbnN0IGNoYXIgKklOVFVTRShkd2FyZl9saW5lX2ZpbGUpIChjb25zdCBEd2FyZl9M aW5lICpsaW5lKQorICAgICAgX19nbnVfaW5saW5lIGNvbnN0IGNoYXIgKklOVFVTRShkd2FyZl9s aW5lX2ZpbGUpIChjb25zdCBEd2FyZl9MaW5lICpsaW5lKQogCXsKIAkgIHJldHVybiBsaW5lLT5m aWxlcy0+aW5mb1tsaW5lLT5maWxlXS5uYW1lOwogCX0KLSAgICAgIGlubGluZSBEd2FyZl9MaW5l ICpkd2ZsX2xpbmUgKGNvbnN0IER3ZmxfTGluZSAqbGluZSkKKyAgICAgIF9fZ251X2lubGluZSBE d2FyZl9MaW5lICpkd2ZsX2xpbmUgKGNvbnN0IER3ZmxfTGluZSAqbGluZSkKIAl7CiAJICByZXR1 cm4gJmR3ZmxfbGluZWN1IChsaW5lKS0+ZGllLmN1LT5saW5lcy0+aW5mb1tsaW5lLT5pZHhdOwog CX0KLSAgICAgIGlubGluZSBjb25zdCBjaGFyICpkd2ZsX2xpbmVfZmlsZSAoY29uc3QgRHdmbF9M aW5lICpsaW5lKQorICAgICAgX19nbnVfaW5saW5lIGNvbnN0IGNoYXIgKmR3ZmxfbGluZV9maWxl IChjb25zdCBEd2ZsX0xpbmUgKmxpbmUpCiAJewogCSAgcmV0dXJuIElOVFVTRShkd2FyZl9saW5l X2ZpbGUpIChkd2ZsX2xpbmUgKGxpbmUpKTsKIAl9CmRpZmYgLU5hdXIgZWxmdXRpbHMtMC4xMzEt b3JpZy9saWJkd2ZsL2VsZi1mcm9tLW1lbW9yeS5jIGVsZnV0aWxzLTAuMTMxL2xpYmR3ZmwvZWxm LWZyb20tbWVtb3J5LmMKLS0tIGVsZnV0aWxzLTAuMTMxLW9yaWcvbGliZHdmbC9lbGYtZnJvbS1t ZW1vcnkuYwkyMDA3LTA4LTE0IDE2OjI4OjI3LjAwMDAwMDAwMCAtMDYwMAorKysgZWxmdXRpbHMt MC4xMzEvbGliZHdmbC9lbGYtZnJvbS1tZW1vcnkuYwkyMDA4LTAxLTA2IDEwOjA3OjMwLjAwMDAw MDAwMCAtMDYwMApAQCAtMjE2LDcgKzIxNiw3IEBACiAgIGJvb2wgZm91bmRfYmFzZSA9IGZhbHNl OwogICBzd2l0Y2ggKGVoZHIuZTMyLmVfaWRlbnRbRUlfQ0xBU1NdKQogICAgIHsKLSAgICAgIGlu bGluZSB2b2lkIGhhbmRsZV9zZWdtZW50IChHRWxmX0FkZHIgdmFkZHIsIEdFbGZfT2ZmIG9mZnNl dCwKKyAgICAgIF9fZ251X2lubGluZSB2b2lkIGhhbmRsZV9zZWdtZW50IChHRWxmX0FkZHIgdmFk ZHIsIEdFbGZfT2ZmIG9mZnNldCwKIAkJCQkgIEdFbGZfWHdvcmQgZmlsZXN6LCBHRWxmX1h3b3Jk IGFsaWduKQogCXsKIAkgIEdFbGZfT2ZmIHNlZ21lbnRfZW5kID0gKChvZmZzZXQgKyBmaWxlc3og KyBhbGlnbiAtIDEpICYgLWFsaWduKTsKQEAgLTI4MCw3ICsyODAsNyBAQAogCiAgIHN3aXRjaCAo ZWhkci5lMzIuZV9pZGVudFtFSV9DTEFTU10pCiAgICAgewotICAgICAgaW5saW5lIGJvb2wgaGFu ZGxlX3NlZ21lbnQgKEdFbGZfQWRkciB2YWRkciwgR0VsZl9PZmYgb2Zmc2V0LAorICAgICAgX19n bnVfaW5saW5lIGJvb2wgaGFuZGxlX3NlZ21lbnQgKEdFbGZfQWRkciB2YWRkciwgR0VsZl9PZmYg b2Zmc2V0LAogCQkJCSAgR0VsZl9Yd29yZCBmaWxlc3osIEdFbGZfWHdvcmQgYWxpZ24pCiAJewog CSAgR0VsZl9PZmYgc3RhcnQgPSBvZmZzZXQgJiAtYWxpZ247CmRpZmYgLU5hdXIgZWxmdXRpbHMt MC4xMzEtb3JpZy9saWJkd2ZsL2xpbnV4LWtlcm5lbC1tb2R1bGVzLmMgZWxmdXRpbHMtMC4xMzEv bGliZHdmbC9saW51eC1rZXJuZWwtbW9kdWxlcy5jCi0tLSBlbGZ1dGlscy0wLjEzMS1vcmlnL2xp YmR3ZmwvbGludXgta2VybmVsLW1vZHVsZXMuYwkyMDA3LTExLTExIDEzOjI5OjAwLjAwMDAwMDAw MCAtMDYwMAorKysgZWxmdXRpbHMtMC4xMzEvbGliZHdmbC9saW51eC1rZXJuZWwtbW9kdWxlcy5j CTIwMDgtMDEtMDYgMTA6MDY6NDUuMDAwMDAwMDAwIC0wNjAwCkBAIC01NDEsNyArNTQxLDcgQEAK IHsKICAgRHdhcmZfQWRkciBzdGFydDsKICAgRHdhcmZfQWRkciBlbmQ7Ci0gIGlubGluZSBEd2Zs X01vZHVsZSAqcmVwb3J0ICh2b2lkKQorICBfX2dudV9pbmxpbmUgRHdmbF9Nb2R1bGUgKnJlcG9y dCAodm9pZCkKICAgICB7CiAgICAgICByZXR1cm4gSU5UVVNFKGR3ZmxfcmVwb3J0X21vZHVsZSkg KGR3ZmwsIEtFUk5FTF9NT0ROQU1FLCBzdGFydCwgZW5kKTsKICAgICB9CkBAIC02MjgsNyArNjI4 LDcgQEAKICAgICAgb25seSAnXycgYW5kIG9uZSBvbmx5IHVzaW5nICctJy4gICovCiAKICAgY2hh ciBhbHRlcm5hdGVfbmFtZVtuYW1lbGVuICsgMV07Ci0gIGlubGluZSBib29sIHN1YnN0X25hbWUg KGNoYXIgZnJvbSwgY2hhciB0bykKKyAgX19nbnVfaW5saW5lIGJvb2wgc3Vic3RfbmFtZSAoY2hh ciBmcm9tLCBjaGFyIHRvKQogICAgIHsKICAgICAgIGNvbnN0IGNoYXIgKm4gPSBtZW1jaHIgKG1v ZHVsZV9uYW1lLCBmcm9tLCBuYW1lbGVuKTsKICAgICAgIGlmIChuID09IE5VTEwpCmRpZmYgLU5h dXIgZWxmdXRpbHMtMC4xMzEtb3JpZy9saWJkd2ZsL2xpbnV4LXByb2MtbWFwcy5jIGVsZnV0aWxz LTAuMTMxL2xpYmR3ZmwvbGludXgtcHJvYy1tYXBzLmMKLS0tIGVsZnV0aWxzLTAuMTMxLW9yaWcv bGliZHdmbC9saW51eC1wcm9jLW1hcHMuYwkyMDA3LTA2LTA1IDE3OjIzOjQ2LjAwMDAwMDAwMCAt MDYwMAorKysgZWxmdXRpbHMtMC4xMzEvbGliZHdmbC9saW51eC1wcm9jLW1hcHMuYwkyMDA4LTAx LTA2IDEwOjA2OjA0LjAwMDAwMDAwMCAtMDYwMApAQCAtMTM0LDcgKzEzNCw3IEBACiAgIGNoYXIg Kmxhc3RfZmlsZSA9IE5VTEw7CiAgIER3YXJmX0FkZHIgbG93ID0gMCwgaGlnaCA9IDA7CiAKLSAg aW5saW5lIGJvb2wgcmVwb3J0ICh2b2lkKQorICBfX2dudV9pbmxpbmUgYm9vbCByZXBvcnQgKHZv aWQpCiAgICAgewogICAgICAgaWYgKGxhc3RfZmlsZSAhPSBOVUxMKQogCXsKZGlmZiAtTmF1ciBl bGZ1dGlscy0wLjEzMS1vcmlnL3NyYy9sZC5oIGVsZnV0aWxzLTAuMTMxL3NyYy9sZC5oCi0tLSBl bGZ1dGlscy0wLjEzMS1vcmlnL3NyYy9sZC5oCTIwMDctMDYtMDUgMTc6MjM6NDcuMDAwMDAwMDAw IC0wNjAwCisrKyBlbGZ1dGlscy0wLjEzMS9zcmMvbGQuaAkyMDA4LTAxLTA2IDA5OjUzOjAyLjAw MDAwMDAwMCAtMDYwMApAQCAtMTA4Nyw3ICsxMDg3LDcgQEAKIAogLyogQ2hlY2tlZCB3aGV0aGVy IHRoZSBzeW1ib2wgaXMgdW5kZWZpbmVkIGFuZCByZWZlcmVuY2VkIGZyb20gYSBEU08uICAqLwog ZXh0ZXJuIGJvb2wgbGlua2VkX2Zyb21fZHNvX3AgKHN0cnVjdCBzY25pbmZvICpzY25pbmZvLCBz aXplX3Qgc3ltaWR4KTsKLWV4dGVybiBpbmxpbmUgYm9vbAorZXh0ZXJuIF9fZ251X2lubGluZSBi b29sCiBsaW5rZWRfZnJvbV9kc29fcCAoc3RydWN0IHNjbmluZm8gKnNjbmluZm8sIHNpemVfdCBz eW1pZHgpCiB7CiAgIHN0cnVjdCB1c2VkZmlsZXMgKmZpbGUgPSBzY25pbmZvLT5maWxlaW5mbzsK ZGlmZiAtTmF1ciBlbGZ1dGlscy0wLjEzMS1vcmlnL3NyYy9yZWFkZWxmLmMgZWxmdXRpbHMtMC4x MzEvc3JjL3JlYWRlbGYuYwotLS0gZWxmdXRpbHMtMC4xMzEtb3JpZy9zcmMvcmVhZGVsZi5jCTIw MDgtMDEtMDYgMDk6NTA6MjYuMDAwMDAwMDAwIC0wNjAwCisrKyBlbGZ1dGlscy0wLjEzMS9zcmMv cmVhZGVsZi5jCTIwMDgtMDEtMDYgMTA6MTA6NTcuMDAwMDAwMDAwIC0wNjAwCkBAIC01NzIyLDcg KzU3MjIsNyBAQAogICBxc29ydCAocmVncywgbWF4cmVnICsgMSwgc2l6ZW9mIHJlZ3NbMF0sICZj b21wYXJlX3JlZ2lzdGVycyk7CiAKICAgLyogQ29sbGVjdCB0aGUgdW5pcXVlIHNldHMgYW5kIHNv cnQgdGhlbS4gICovCi0gIGlubGluZSBib29sIHNhbWVfc2V0IChjb25zdCBzdHJ1Y3QgcmVnaXN0 ZXJfaW5mbyAqYSwKKyAgX19nbnVfaW5saW5lIGJvb2wgc2FtZV9zZXQgKGNvbnN0IHN0cnVjdCBy ZWdpc3Rlcl9pbmZvICphLAogCQkJY29uc3Qgc3RydWN0IHJlZ2lzdGVyX2luZm8gKmIpCiAgIHsK ICAgICByZXR1cm4gKGEgPCAmcmVnc1ttYXhucmVnXSAmJiBhLT5yZWdsb2MgIT0gTlVMTApkaWZm IC1OYXVyIGVsZnV0aWxzLTAuMTMxLW9yaWcvc3JjL3N0cmlwLmMgZWxmdXRpbHMtMC4xMzEvc3Jj L3N0cmlwLmMKLS0tIGVsZnV0aWxzLTAuMTMxLW9yaWcvc3JjL3N0cmlwLmMJMjAwOC0wMS0wNiAw OTo1MDoyNi4wMDAwMDAwMDAgLTA2MDAKKysrIGVsZnV0aWxzLTAuMTMxL3NyYy9zdHJpcC5jCTIw MDgtMDEtMDYgMTA6MDk6MjIuMDAwMDAwMDAwIC0wNjAwCkBAIC0xMzM2LDcgKzEzMzYsNyBAQAog CSAgLyogVXBkYXRlIHNlY3Rpb24gaGVhZGVycyB3aGVuIHRoZSBkYXRhIHNpemUgaGFzIGNoYW5n ZWQuCiAJICAgICBXZSBhbHNvIHVwZGF0ZSB0aGUgU0hUX05PQklUUyBzZWN0aW9uIGluIHRoZSBk ZWJ1ZwogCSAgICAgZmlsZSBzbyB0aGF0IHRoZSBzZWN0aW9uIGhlYWRlcnMgbWF0Y2ggaW4gc2hf c2l6ZS4gICovCi0JICBpbmxpbmUgdm9pZCB1cGRhdGVfc2VjdGlvbl9zaXplIChjb25zdCBFbGZf RGF0YSAqbmV3ZGF0YSkKKwkgIF9fZ251X2lubGluZSB2b2lkIHVwZGF0ZV9zZWN0aW9uX3NpemUg KGNvbnN0IEVsZl9EYXRhICpuZXdkYXRhKQogCSAgICB7CiAJICAgICAgR0VsZl9TaGRyIHNoZHJf bWVtOwogCSAgICAgIEdFbGZfU2hkciAqc2hkciA9IGdlbGZfZ2V0c2hkciAoc2NuLCAmc2hkcl9t ZW0pOwpkaWZmIC1OYXVyIGVsZnV0aWxzLTAuMTMxLW9yaWcvc3JjL3Vuc3RyaXAuYyBlbGZ1dGls cy0wLjEzMS9zcmMvdW5zdHJpcC5jCi0tLSBlbGZ1dGlscy0wLjEzMS1vcmlnL3NyYy91bnN0cmlw LmMJMjAwNy0xMS0xMSAxMzoyOTowMC4wMDAwMDAwMDAgLTA2MDAKKysrIGVsZnV0aWxzLTAuMTMx L3NyYy91bnN0cmlwLmMJMjAwOC0wMS0wNiAxMDowOTo1OS4wMDAwMDAwMDAgLTA2MDAKQEAgLTM4 OSw3ICszODksNyBAQAogewogICBFbGZfRGF0YSAqZGF0YSA9IGVsZl9nZXRkYXRhIChvdXRzY24s IE5VTEwpOwogCi0gIGlubGluZSB2b2lkIGFkanVzdF9yZWxvYyAoR0VsZl9Yd29yZCAqaW5mbykK KyAgX19nbnVfaW5saW5lIHZvaWQgYWRqdXN0X3JlbG9jIChHRWxmX1h3b3JkICppbmZvKQogICAg IHsKICAgICAgIHNpemVfdCBuZHggPSBHRUxGX1JfU1lNICgqaW5mbyk7CiAgICAgICBpZiAobmR4 ICE9IFNUTl9VTkRFRikKQEAgLTEwMzksNyArMTAzOSw3IEBACiAgICAgfQogCiAgIGJvb2wgZmFp bCA9IGZhbHNlOwotICBpbmxpbmUgdm9pZCBjaGVja19tYXRjaCAoYm9vbCBtYXRjaCwgRWxmX1Nj biAqc2NuLCBjb25zdCBjaGFyICpuYW1lKQorICBfX2dudV9pbmxpbmUgdm9pZCBjaGVja19tYXRj aCAoYm9vbCBtYXRjaCwgRWxmX1NjbiAqc2NuLCBjb25zdCBjaGFyICpuYW1lKQogICAgIHsKICAg ICAgIGlmICghbWF0Y2gpCiAJewpAQCAtMTI2Nyw3ICsxMjY3LDcgQEAKICAgICB9CiAKICAgLyog TG9jYXRlIGEgbWF0Y2hpbmcgdW5hbGxvY2F0ZWQgc2VjdGlvbiBpbiBTRUNUSU9OUy4gICovCi0g IGlubGluZSBzdHJ1Y3Qgc2VjdGlvbiAqZmluZF91bmFsbG9jX3NlY3Rpb24gKGNvbnN0IEdFbGZf U2hkciAqc2hkciwKKyAgX19nbnVfaW5saW5lIHN0cnVjdCBzZWN0aW9uICpmaW5kX3VuYWxsb2Nf c2VjdGlvbiAoY29uc3QgR0VsZl9TaGRyICpzaGRyLAogCQkJCQkgICAgICAgY29uc3QgY2hhciAq bmFtZSkKICAgICB7CiAgICAgICBzaXplX3QgbCA9IG5hbGxvYywgdSA9IHN0cmlwcGVkX3NobnVt IC0gMTsKQEAgLTIxODIsNyArMjE4Miw3IEBACiBoYW5kbGVfaW1wbGljaXRfbW9kdWxlcyAoY29u c3Qgc3RydWN0IGFyZ19pbmZvICppbmZvKQogewogICBzdHJ1Y3QgbWF0Y2hfbW9kdWxlX2luZm8g bW1pID0geyBpbmZvLT5hcmdzLCBOVUxMLCBpbmZvLT5tYXRjaF9maWxlcyB9OwotICBpbmxpbmUg cHRyZGlmZl90IG5leHQgKHB0cmRpZmZfdCBvZmZzZXQpCisgIF9fZ251X2lubGluZSBwdHJkaWZm X3QgbmV4dCAocHRyZGlmZl90IG9mZnNldCkKICAgICB7CiAgICAgICByZXR1cm4gZHdmbF9nZXRt b2R1bGVzIChpbmZvLT5kd2ZsLCAmbWF0Y2hfbW9kdWxlLCAmbW1pLCBvZmZzZXQpOwogICAgIH0K