Date: Sun, 30 Jan 2011 22:30:16 GMT From: "Pedro F. Giffuni" <giffunip@tutopia.com> To: freebsd-bugs@FreeBSD.org Subject: Re: gnu/154385: Minor fixes to contrib/libstdc++ Message-ID: <201101302230.p0UMUGVm046101@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR gnu/154385; it has been noted by GNATS. From: "Pedro F. Giffuni" <giffunip@tutopia.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: Re: gnu/154385: Minor fixes to contrib/libstdc++ Date: Sun, 30 Jan 2011 14:25:19 -0800 (PST) --0-869839225-1296426319=:26178 Content-Type: text/plain; charset=us-ascii Apparently this patch has all that's needed. --0-869839225-1296426319=:26178 Content-Type: text/plain; name="patch-libstdc++.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="patch-libstdc++.txt" LS0tIGxpYnN0ZGMrKy9pbmNsdWRlL3N0ZC9zdGRfdmFsYXJyYXkuaAkyMDA3 LzAxLzE1IDE2OjQ1OjQ0CTEyMDc5OQorKysgbGlic3RkYysrL2luY2x1ZGUv c3RkL3N0ZF92YWxhcnJheS5oCTIwMDcvMDgvMTcgMDk6Mjg6MDkJMTI3NTgw CkBAIC0xMDEwLDcgKzEwMTAsNyBAQAogICAgIHsJCQkJCQkJCQlcCiAgICAg ICB0eXBlZGVmIF9CaW5DbG9zPF9OYW1lLCBfQ29uc3RhbnQsIF9WYWxBcnJh eSwgX1RwLCBfVHA+IF9DbG9zdXJlOyBcCiAgICAgICB0eXBlZGVmIHR5cGVu YW1lIF9fZnVuPF9OYW1lLCBfVHA+OjpyZXN1bHRfdHlwZSBfUnQ7ICAgICAg ICAgICAgICBcCi0gICAgICByZXR1cm4gX0V4cHI8X0Nsb3N1cmUsIF9UcD4o X0Nsb3N1cmUoX190LCBfX3YpKTsgICAgICAgIAkgICAgICAgIFwKKyAgICAg IHJldHVybiBfRXhwcjxfQ2xvc3VyZSwgX1J0PihfQ2xvc3VyZShfX3QsIF9f dikpOyAgICAgICAgCSAgICAgICAgXAogICAgIH0KIAogX0RFRklORV9CSU5B UllfT1BFUkFUT1IoKywgX19wbHVzKQotLS0gbGlic3RkYysrL2luY2x1ZGUv dHIxL3JhbmRvbQkyMDA3LzA0LzA3IDA4OjM4OjM5CTEyMzYzNworKysgbGli c3RkYysrL2luY2x1ZGUvdHIxL3JhbmRvbQkyMDA3LzEwLzIwIDEwOjAyOjM0 CTEyOTUwNwpAQCAtMTYxOCw3ICsxNjE4LDE2IEBACiAgICAgICAgIHJlc3Vs dF90eXBlCiAgICAgICAgIF9NX2NhbGwoX1VuaWZvcm1SYW5kb21OdW1iZXJH ZW5lcmF0b3ImIF9fdXJuZywKIAkJcmVzdWx0X3R5cGUgX19taW4sIHJlc3Vs dF90eXBlIF9fbWF4LCB0cnVlX3R5cGUpCi0gICAgICAgIHsgcmV0dXJuIHJl c3VsdF90eXBlKF9fdXJuZygpICUgKF9fbWF4IC0gX19taW4gKyAxKSkgKyBf X21pbjsgfQorICAgICAgICB7CisJICAvLyBYWFggTXVzdCBiZSBmaXhlZCB0 byBhbHNvIHdvcmsgd2hlbiBfX3VybmcubWF4KCkgLSBfX3VybmcubWluKCkK KwkgIC8vIGlzIHNtYWxsZXIgdGhhbiBfX21heCAtIF9fbWluLgorCSAgdHlw ZWRlZiB0eXBlbmFtZSBfX2dudV9jeHg6Ol9fYWRkX3Vuc2lnbmVkPHR5cGVu YW1lCisJICAgIF9Vbmlmb3JtUmFuZG9tTnVtYmVyR2VuZXJhdG9yOjpyZXN1 bHRfdHlwZT46Ol9fdHlwZSBfX3V0eXBlOworCSAgcmV0dXJuIHJlc3VsdF90 eXBlKChfX21heCAtIF9fbWluICsgMS4wTCkKKwkJCSAgICAgKiAoX191dHlw ZShfX3VybmcoKSkgLSBfX3V0eXBlKF9fdXJuZy5taW4oKSkpCisJCQkgICAg IC8gKF9fdXR5cGUoX191cm5nLm1heCgpKQorCQkJCS0gX191dHlwZShfX3Vy bmcubWluKCkpICsgMS4wTCkpICsgX19taW47CisJfQogCiAgICAgICB0ZW1w bGF0ZTx0eXBlbmFtZSBfVW5pZm9ybVJhbmRvbU51bWJlckdlbmVyYXRvcj4K ICAgICAgICAgcmVzdWx0X3R5cGUKLS0tIGxpYnN0ZGMrKy9saWJzdXBjKysv dHlwZWluZm8JMjAwNy8wNi8yNiAxNTozNTo0MgkxMjYwMzAKKysrIGxpYnN0 ZGMrKy9saWJzdXBjKysvdHlwZWluZm8JMjAwNy8xMC8wNiAyMzo0ODozMQkx MjkwNjEKQEAgLTk5LDcgKzk5LDEzIEBACiAjZW5kaWYKICAgICBib29sIG9w ZXJhdG9yIT0oY29uc3QgdHlwZV9pbmZvJiBfX2FyZykgY29uc3QKICAgICB7 IHJldHVybiAhb3BlcmF0b3I9PShfX2FyZyk7IH0KLSAgICAKKworICAgIC8v IFJldHVybiB0cnVlIGlmIHRoaXMgaXMgYSBwb2ludGVyIHR5cGUgb2Ygc29t ZSBraW5kCisgICAgdmlydHVhbCBib29sIF9faXNfcG9pbnRlcl9wKCkgY29u c3Q7CisKKyAgICAvLyBSZXR1cm4gdHJ1ZSBpZiB0aGlzIGlzIGEgZnVuY3Rp b24gdHlwZQorICAgIHZpcnR1YWwgYm9vbCBfX2lzX2Z1bmN0aW9uX3AoKSBj b25zdDsKKwogICAgIC8vIFRyeSBhbmQgY2F0Y2ggYSB0aHJvd24gdHlwZS4g U3RvcmUgYW4gYWRqdXN0ZWQgcG9pbnRlciB0byB0aGUKICAgICAvLyBjYXVn aHQgdHlwZSBpbiBUSFJfT0JKLiBJZiBUSFJfVFlQRSBpcyBub3QgYSBwb2lu dGVyIHR5cGUsIHRoZW4KICAgICAvLyBUSFJfT0JKIHBvaW50cyB0byB0aGUg dGhyb3duIG9iamVjdC4gSWYgVEhSX1RZUEUgaXMgYSBwb2ludGVyCkBAIC0x MTMsMTIgKzExOSw2IEBACiAgICAgdmlydHVhbCBib29sIF9fZG9fdXBjYXN0 KGNvbnN0IF9fY3h4YWJpdjE6Ol9fY2xhc3NfdHlwZV9pbmZvICpfX3Rhcmdl dCwKIAkJCSAgICAgdm9pZCAqKl9fb2JqX3B0cikgY29uc3Q7CiAKLSAgIC8v IFJldHVybiB0cnVlIGlmIHRoaXMgaXMgYSBwb2ludGVyIHR5cGUgb2Ygc29t ZSBraW5kCi0gICAgdmlydHVhbCBib29sIF9faXNfcG9pbnRlcl9wKCkgY29u c3Q7Ci0KLSAgICAvLyBSZXR1cm4gdHJ1ZSBpZiB0aGlzIGlzIGEgZnVuY3Rp b24gdHlwZQotICAgIHZpcnR1YWwgYm9vbCBfX2lzX2Z1bmN0aW9uX3AoKSBj b25zdDsKLQogICBwcm90ZWN0ZWQ6CiAgICAgY29uc3QgY2hhciAqX19uYW1l OwogICAgIAotLS0gbGlic3RkYysrL2luY2x1ZGUvZXh0L2NvZGVjdnRfc3Bl Y2lhbGl6YXRpb25zLmgJMjAwNi8xMC8yMSAwMjo0MTozOAkxMTc5MjMKKysr IGxpYnN0ZGMrKy9pbmNsdWRlL2V4dC9jb2RlY3Z0X3NwZWNpYWxpemF0aW9u cy5oCTIwMDcvMTAvMTEgMTU6MjM6MTEJMTI5MjM1CkBAIC0xMjgsNyArMTI4 LDcgQEAKICAgICBib29sCiAgICAgZ29vZCgpIGNvbnN0IHRocm93KCkKICAg ICB7IAotICAgICAgY29uc3QgZGVzY3JpcHRvcl90eXBlIF9fZXJyID0gcmVp bnRlcnByZXRfY2FzdDxpY29udl90PigtMSk7CisgICAgICBjb25zdCBkZXNj cmlwdG9yX3R5cGUgX19lcnIgPSAoaWNvbnZfdCkoLTEpOwogICAgICAgYm9v bCBfX3Rlc3QgPSBfTV9pbl9kZXNjICYmIF9NX2luX2Rlc2MgIT0gX19lcnI7 IAogICAgICAgX190ZXN0ICY9ICBfTV9vdXRfZGVzYyAmJiBfTV9vdXRfZGVz YyAhPSBfX2VycjsKICAgICAgIHJldHVybiBfX3Rlc3Q7CkBAIC0xNjYsNyAr MTY2LDcgQEAKICAgICB2b2lkCiAgICAgaW5pdCgpCiAgICAgewotICAgICAg Y29uc3QgZGVzY3JpcHRvcl90eXBlIF9fZXJyID0gcmVpbnRlcnByZXRfY2Fz dDxpY29udl90PigtMSk7CisgICAgICBjb25zdCBkZXNjcmlwdG9yX3R5cGUg X19lcnIgPSAoaWNvbnZfdCkoLTEpOwogICAgICAgY29uc3QgYm9vbCBfX2hh dmVfZW5jb2RpbmdzID0gX01faW50X2VuYy5zaXplKCkgJiYgX01fZXh0X2Vu Yy5zaXplKCk7CiAgICAgICBpZiAoIV9NX2luX2Rlc2MgJiYgX19oYXZlX2Vu Y29kaW5ncykKIAl7CkBAIC0xOTksNyArMTk5LDcgQEAKICAgICB2b2lkCiAg ICAgZGVzdHJveSgpIHRocm93KCkKICAgICB7Ci0gICAgICBjb25zdCBkZXNj cmlwdG9yX3R5cGUgX19lcnIgPSByZWludGVycHJldF9jYXN0PGljb252X3Q+ KC0xKTsKKyAgICAgIGNvbnN0IGRlc2NyaXB0b3JfdHlwZSBfX2VyciA9IChp Y29udl90KSgtMSk7CiAgICAgICBpZiAoX01faW5fZGVzYyAmJiBfTV9pbl9k ZXNjICE9IF9fZXJyKSAKIAl7CiAJICBpY29udl9jbG9zZShfTV9pbl9kZXNj KTsKLS0tIGxpYnN0ZGMrKy9pbmNsdWRlL3RyMS9ib29zdF9zaGFyZWRfcHRy LmgJMjAwNi8xMi8wNyAwOTozMzo1MQkxMTk2MTAKKysrIGxpYnN0ZGMrKy9p bmNsdWRlL3RyMS9ib29zdF9zaGFyZWRfcHRyLmgJMjAwNy8xMC8xNCAxNzo0 MDo1MAkxMjkyOTcKQEAgLTg1Nyw3ICs4NTcsNyBAQAogCSAgICAvLyBROiBI b3cgY2FuIHdlIGdldCBoZXJlPwogCSAgICAvLyBBOiBBbm90aGVyIHRocmVh ZCBtYXkgaGF2ZSBpbnZhbGlkYXRlZCByIGFmdGVyIHRoZQogCSAgICAvLyAg ICB1c2VfY291bnQgdGVzdCBhYm92ZS4KLQkgICAgcmV0dXJuIF9fc2hhcmVk X3B0cjxlbGVtZW50X3R5cGU+KCk7CisJICAgIHJldHVybiBfX3NoYXJlZF9w dHI8ZWxlbWVudF90eXBlLCBfTHA+KCk7CiAJICB9CiAJCiAjZWxzZQotLS0g bGlic3RkYysrL2luY2x1ZGUvYml0cy9hbGxvY2F0b3IuaAkyMDA2LzEwLzIx IDAyOjQxOjM4CTExNzkyMworKysgbGlic3RkYysrL2luY2x1ZGUvYml0cy9h bGxvY2F0b3IuaAkyMDA3LzEwLzE4IDE3OjU4OjEzCTEyOTQ1NApAQCAtMTE1 LDExICsxMTUsMjEgQEAKICAgICBvcGVyYXRvcj09KGNvbnN0IGFsbG9jYXRv cjxfVDE+JiwgY29uc3QgYWxsb2NhdG9yPF9UMj4mKQogICAgIHsgcmV0dXJu IHRydWU7IH0KIAorICB0ZW1wbGF0ZTx0eXBlbmFtZSBfVHA+CisgICAgaW5s aW5lIGJvb2wKKyAgICBvcGVyYXRvcj09KGNvbnN0IGFsbG9jYXRvcjxfVHA+ JiwgY29uc3QgYWxsb2NhdG9yPF9UcD4mKQorICAgIHsgcmV0dXJuIHRydWU7 IH0KKwogICB0ZW1wbGF0ZTx0eXBlbmFtZSBfVDEsIHR5cGVuYW1lIF9UMj4K ICAgICBpbmxpbmUgYm9vbAogICAgIG9wZXJhdG9yIT0oY29uc3QgYWxsb2Nh dG9yPF9UMT4mLCBjb25zdCBhbGxvY2F0b3I8X1QyPiYpCiAgICAgeyByZXR1 cm4gZmFsc2U7IH0KIAorICB0ZW1wbGF0ZTx0eXBlbmFtZSBfVHA+CisgICAg aW5saW5lIGJvb2wKKyAgICBvcGVyYXRvciE9KGNvbnN0IGFsbG9jYXRvcjxf VHA+JiwgY29uc3QgYWxsb2NhdG9yPF9UcD4mKQorICAgIHsgcmV0dXJuIGZh bHNlOyB9CisKICAgLy8gSW5oaWJpdCBpbXBsaWNpdCBpbnN0YW50aWF0aW9u cyBmb3IgcmVxdWlyZWQgaW5zdGFudGlhdGlvbnMsCiAgIC8vIHdoaWNoIGFy ZSBkZWZpbmVkIHZpYSBleHBsaWNpdCBpbnN0YW50aWF0aW9ucyBlbHNld2hl cmUuCiAgIC8vIE5COiBUaGlzIHN5bnRheCBpcyBhIEdOVSBleHRlbnNpb24u Ci0tLSBsaWJzdGRjKysvaW5jbHVkZS9iaXRzL2xvY2FsZV9mYWNldHMudGNj CTIwMDYvMTAvMjEgMDI6NDE6MzgJMTE3OTIzCisrKyBsaWJzdGRjKysvaW5j bHVkZS9iaXRzL2xvY2FsZV9mYWNldHMudGNjCTIwMDgvMDEvMDUgMTE6MDQ6 NDMJMTMxMzM0CkBAIC0xLDYgKzEsNyBAQAogLy8gTG9jYWxlIHN1cHBvcnQg LSotIEMrKyAtKi0KIAotLy8gQ29weXJpZ2h0IChDKSAxOTk3LCAxOTk4LCAx OTk5LCAyMDAwLCAyMDAxLCAyMDAyLCAyMDAzLCAyMDA0LCAyMDA1LCAyMDA2 CisvLyBDb3B5cmlnaHQgKEMpIDE5OTcsIDE5OTgsIDE5OTksIDIwMDAsIDIw MDEsIDIwMDIsIDIwMDMsIDIwMDQsIDIwMDUsCisvLyAyMDA2LCAyMDA3CiAv LyBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4KIC8vCiAvLyBUaGlz IGZpbGUgaXMgcGFydCBvZiB0aGUgR05VIElTTyBDKysgTGlicmFyeS4gIFRo aXMgbGlicmFyeSBpcyBmcmVlCkBAIC0xMTcsNiArMTE4LDcgQEAKICAgICAg IHJldHVybiBzdGF0aWNfY2FzdDxjb25zdCBfRmFjZXQmPigqX19mYWNldHNb X19pXSk7CiAgICAgfQogCisKICAgLy8gUm91dGluZSB0byBhY2Nlc3MgYSBj YWNoZSBmb3IgdGhlIGZhY2V0LiAgSWYgdGhlIGNhY2hlIGRpZG4ndAogICAv LyBleGlzdCBiZWZvcmUsIGl0IGdldHMgY29uc3RydWN0ZWQgb24gdGhlIGZs eS4KICAgdGVtcGxhdGU8dHlwZW5hbWUgX0ZhY2V0PgpAQCAtMTAxNSwxMyAr MTAxNywxMyBAQAogCWlmIChfX2J1aWx0aW5fZXhwZWN0KF9fZGVjLCB0cnVl KSkKIAkgIHsKIAkgICAgLy8gRGVjaW1hbC4KLQkgICAgaWYgKF9fdiA+IDAp CisJICAgIGlmIChfX3YgPj0gMCkKIAkgICAgICB7CiAJCWlmIChfX2ZsYWdz ICYgaW9zX2Jhc2U6OnNob3dwb3MKIAkJICAgICYmIG51bWVyaWNfbGltaXRz PF9WYWx1ZVQ+Ojppc19zaWduZWQpCiAJCSAgKi0tX19jcyA9IF9fbGl0W19f bnVtX2Jhc2U6Ol9TX29wbHVzXSwgKytfX2xlbjsKIAkgICAgICB9Ci0JICAg IGVsc2UgaWYgKF9fdikKKwkgICAgZWxzZQogCSAgICAgICotLV9fY3MgPSBf X2xpdFtfX251bV9iYXNlOjpfU19vbWludXNdLCArK19fbGVuOwogCSAgfQog CWVsc2UgaWYgKF9fZmxhZ3MgJiBpb3NfYmFzZTo6c2hvd2Jhc2UgJiYgX192 KQotLS0gbGlic3RkYysrL2xpYnN1cGMrKy9laF9wZXJzb25hbGl0eS5jYwky MDA2LzEwLzIxIDAyOjQxOjM4CTExNzkyMworKysgbGlic3RkYysrL2xpYnN1 cGMrKy9laF9wZXJzb25hbGl0eS5jYwkyMDA4LzAxLzA3IDE2OjA1OjI3CTEz MTM3NgpAQCAtMSw1ICsxLDUgQEAKIC8vIC0qLSBDKysgLSotIFRoZSBHTlUg QysrIGV4Y2VwdGlvbiBwZXJzb25hbGl0eSByb3V0aW5lLgotLy8gQ29weXJp Z2h0IChDKSAyMDAxLCAyMDAyLCAyMDAzLCAyMDA2IEZyZWUgU29mdHdhcmUg Rm91bmRhdGlvbiwgSW5jLgorLy8gQ29weXJpZ2h0IChDKSAyMDAxLCAyMDAy LCAyMDAzLCAyMDA2LCAyMDA4IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwg SW5jLgogLy8KIC8vIFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdDQy4KIC8vCkBA IC00MzQsNyArNDM0LDcgQEAKICAgLy8gUGFyc2UgdGhlIExTREEgaGVhZGVy LgogICBwID0gcGFyc2VfbHNkYV9oZWFkZXIgKGNvbnRleHQsIGxhbmd1YWdl X3NwZWNpZmljX2RhdGEsICZpbmZvKTsKICAgaW5mby50dHlwZV9iYXNlID0g YmFzZV9vZl9lbmNvZGVkX3ZhbHVlIChpbmZvLnR0eXBlX2VuY29kaW5nLCBj b250ZXh0KTsKLSNpZmRlZiBIQVZFX0dFVElQSU5GTworI2lmZGVmIF9HTElC Q1hYX0hBVkVfR0VUSVBJTkZPCiAgIGlwID0gX1Vud2luZF9HZXRJUEluZm8g KGNvbnRleHQsICZpcF9iZWZvcmVfaW5zbik7CiAjZWxzZQogICBpcCA9IF9V bndpbmRfR2V0SVAgKGNvbnRleHQpOwo= --0-869839225-1296426319=:26178--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101302230.p0UMUGVm046101>