From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19487 invoked by alias); 14 Aug 2009 16:22:20 -0000 Received: (qmail 19380 invoked by uid 22791); 14 Aug 2009 16:22:19 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SARE_MSGID_LONG40,SPF_PASS X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (216.239.45.13) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 14 Aug 2009 16:22:12 +0000 Received: from zps18.corp.google.com (zps18.corp.google.com [172.25.146.18]) by smtp-out.google.com with ESMTP id n7EGMAsc013175 for ; Fri, 14 Aug 2009 09:22:10 -0700 Received: from rv-out-0708.google.com (rvfc5.prod.google.com [10.140.180.5]) by zps18.corp.google.com with ESMTP id n7EGM8fR006713 for ; Fri, 14 Aug 2009 09:22:08 -0700 Received: by rv-out-0708.google.com with SMTP id c5so438988rvf.56 for ; Fri, 14 Aug 2009 09:22:08 -0700 (PDT) MIME-Version: 1.0 Received: by 10.140.136.13 with SMTP id j13mr1055038rvd.70.1250266928000; Fri, 14 Aug 2009 09:22:08 -0700 (PDT) Date: Fri, 14 Aug 2009 16:32:00 -0000 Message-ID: <8ac60eac0908140922m57367e9dn464783d8ff625474@mail.gmail.com> Subject: [patch] Fix Darwin breakage From: Paul Pluzhnikov To: gdb-patches ml Cc: Christian Thalinger Content-Type: multipart/mixed; boundary=000e0cd290401e2e1404711c74f8 X-System-Of-Record: true X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-08/txt/msg00196.txt.bz2 --000e0cd290401e2e1404711c74f8 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-length: 705 Greetings, This patch: http://sourceware.org/ml/gdb-patches/2009-07/msg00417.html caused Darwin/MacOSX to stop working with assertion: objfiles.c:793: internal-error: qsort_cmp: Assertion `obj_section_endaddr (sect1) <= sect2_addr' failed. Turns out this worked only "by accident" before. Here is a proposed fix. Tested by running "./gdb ./gdb", setting breakpoints, etc. (I don't have dejagnu setup on MacOS yet). Thanks, -- Paul Pluzhnikov 2009-08-14 Paul Pluzhnikov * objfiles.h (OBJF_NOT_MAPPED): New macro. * objfiles.c (update_section_map): Ignore unmapped objfiles. * machoread.c (macho_oso_symfile): Set OBJF_NOT_MAPPED for oso files. --000e0cd290401e2e1404711c74f8 Content-Type: text/plain; charset=US-ASCII; name="gdb-macho-20090814.txt" Content-Disposition: attachment; filename="gdb-macho-20090814.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fyd4m7lg0 Content-length: 3843 SW5kZXg6IG1hY2hvcmVhZC5jCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNT IGZpbGU6IC9jdnMvc3JjL3NyYy9nZGIvbWFjaG9yZWFkLmMsdgpyZXRyaWV2 aW5nIHJldmlzaW9uIDEuNQpkaWZmIC1wIC11IC1yMS41IG1hY2hvcmVhZC5j Ci0tLSBtYWNob3JlYWQuYwkxOSBKdW4gMjAwOSAxNDozMDozMCAtMDAwMAkx LjUKKysrIG1hY2hvcmVhZC5jCTE0IEF1ZyAyMDA5IDE2OjA4OjUwIC0wMDAw CkBAIC00MDYsNyArNDA2LDcgQEAgbWFjaG9fb3NvX3N5bWZpbGUgKHN0cnVj dCBvYmpmaWxlICptYWluXwogCSAgICAgIGJmZF9jbG9zZSAobWVtYmVyX2Jm ZCk7CiAJICAgIH0KIAkgICAgZWxzZQotCSAgICAgIHN5bWJvbF9maWxlX2Fk ZF9mcm9tX2JmZCAobWVtYmVyX2JmZCwgMCwgYWRkcnMsIDApOworCSAgICAg IHN5bWJvbF9maWxlX2FkZF9mcm9tX2JmZCAobWVtYmVyX2JmZCwgMCwgYWRk cnMsIE9CSkZfTk9UX01BUFBFRCk7CiAJfQogICAgICAgZWxzZQogCXsKQEAg LTQyOSw3ICs0MjksNyBAQCBtYWNob19vc29fc3ltZmlsZSAoc3RydWN0IG9i amZpbGUgKm1haW5fCiAJICAgICAgY29udGludWU7CiAJICAgIH0KICAgCi0J ICBzeW1ib2xfZmlsZV9hZGRfZnJvbV9iZmQgKGFiZmQsIDAsIGFkZHJzLCAw KTsKKwkgIHN5bWJvbF9maWxlX2FkZF9mcm9tX2JmZCAoYWJmZCwgMCwgYWRk cnMsIE9CSkZfTk9UX01BUFBFRCk7CiAJfQogICAgICAgeGZyZWUgKG9zby0+ c3ltYm9scyk7CiAgICAgICB4ZnJlZSAob3NvLT5vZmZzZXRzKTsKQEAgLTU5 Miw3ICs1OTIsNyBAQCBtYWNob19zeW1maWxlX3JlYWQgKHN0cnVjdCBvYmpm aWxlICpvYmpmCiAJICBvc29fdmVjdG9yID0gTlVMTDsKIAogCSAgLyogTm93 IHJlY3Vyc2U6IHJlYWQgZHdhcmYgZnJvbSBkc3ltLiAgKi8KLQkgIHN5bWJv bF9maWxlX2FkZF9mcm9tX2JmZCAoZHN5bV9iZmQsIDAsIE5VTEwsIDApOwor CSAgc3ltYm9sX2ZpbGVfYWRkX2Zyb21fYmZkIChkc3ltX2JmZCwgMCwgTlVM TCwgT0JKRl9OT1RfTUFQUEVEKTsKICAgICAgIAogCSAgLyogRG9uJ3QgdHJ5 IHRvIHJlYWQgZHdhcmYyIGZyb20gbWFpbiBmaWxlIG9yIHNoYXJlZCBsaWJy YXJpZXMuICAqLwogCSAgcmV0dXJuOwpJbmRleDogb2JqZmlsZXMuYwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3NyYy9zcmMvZ2Ri L29iamZpbGVzLmMsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuOTEKZGlmZiAt cCAtdSAtcjEuOTEgb2JqZmlsZXMuYwotLS0gb2JqZmlsZXMuYwkxMCBBdWcg MjAwOSAyMjowOToyMiAtMDAwMAkxLjkxCisrKyBvYmpmaWxlcy5jCTE0IEF1 ZyAyMDA5IDE2OjA4OjUwIC0wMDAwCkBAIC04NDAsMTYgKzg0MCwyMCBAQCB1 cGRhdGVfc2VjdGlvbl9tYXAgKHN0cnVjdCBvYmpfc2VjdGlvbiAqCiAgICAg JiBTRUNfVEhSRUFEX0xPQ0FMKSA9PSAwKQogCiAgIG1hcF9zaXplID0gMDsK LSAgQUxMX09CSlNFQ1RJT05TIChvYmpmaWxlLCBzKQotICAgIGlmIChpbnNl cnRfcCAob2JqZmlsZSwgcykpCi0gICAgICBtYXBfc2l6ZSArPSAxOworICBB TExfT0JKRklMRVMgKG9iamZpbGUpCQorICAgIGlmICgob2JqZmlsZS0+Zmxh Z3MgJiBPQkpGX05PVF9NQVBQRUQpID09IDApCisgICAgICBBTExfT0JKRklM RV9PU0VDVElPTlMgKG9iamZpbGUsIHMpCisJaWYgKGluc2VydF9wIChvYmpm aWxlLCBzKSkKKwkgIG1hcF9zaXplICs9IDE7CiAKICAgbWFwID0geG1hbGxv YyAobWFwX3NpemUgKiBzaXplb2YgKCptYXApKTsKIAogICBpID0gMDsKLSAg QUxMX09CSlNFQ1RJT05TIChvYmpmaWxlLCBzKQotICAgIGlmIChpbnNlcnRf cCAob2JqZmlsZSwgcykpCi0gICAgICBtYXBbaSsrXSA9IHM7CisgIEFMTF9P QkpGSUxFUyAob2JqZmlsZSkJCisgICAgaWYgKChvYmpmaWxlLT5mbGFncyAm IE9CSkZfTk9UX01BUFBFRCkgPT0gMCkKKyAgICAgIEFMTF9PQkpGSUxFX09T RUNUSU9OUyAob2JqZmlsZSwgcykKKwlpZiAoaW5zZXJ0X3AgKG9iamZpbGUs IHMpKQorCSAgbWFwW2krK10gPSBzOwogCiAjdW5kZWYgaW5zZXJ0X3AKIApJ bmRleDogb2JqZmlsZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBm aWxlOiAvY3ZzL3NyYy9zcmMvZ2RiL29iamZpbGVzLmgsdgpyZXRyaWV2aW5n IHJldmlzaW9uIDEuNjEKZGlmZiAtcCAtdSAtcjEuNjEgb2JqZmlsZXMuaAot LS0gb2JqZmlsZXMuaAk0IEF1ZyAyMDA5IDE4OjQ2OjA1IC0wMDAwCTEuNjEK KysrIG9iamZpbGVzLmgJMTQgQXVnIDIwMDkgMTY6MDg6NTAgLTAwMDAKQEAg LTQxNCw2ICs0MTQsMTIgQEAgc3RydWN0IG9iamZpbGUKIAogI2RlZmluZSBP QkpGX1VTRVJMT0FERUQJKDEgPDwgMykJLyogVXNlciBsb2FkZWQgKi8KIAor LyogVGhpcyBvYmpmaWxlIGlzIG5vdCBtYXBwZWQgaW50byB0aGUgcHJvY2Vz cyBhZGRyZXNzIHNwYWNlLiBXZSBvbmx5IGhhdmUgaXQKKyAgIGZvciBpdHMg ZGVidWcgYml0cy4gIE9uZSBleGFtcGxlIGlzIE1BQ0gtTyAoIm90aGVyIHNv dXJjZSIpIG9iamVjdAorICAgZmlsZXMuICAqLworCisjZGVmaW5lIE9CSkZf Tk9UX01BUFBFRCAoMSA8PCA0KSAgICAgICAgLyogTm90IG1hcHBlZCAqLwor CiAvKiBUaGUgb2JqZWN0IGZpbGUgdGhhdCB0aGUgbWFpbiBzeW1ib2wgdGFi bGUgd2FzIGxvYWRlZCBmcm9tIChlLmcuIHRoZQogICAgYXJndW1lbnQgdG8g dGhlICJzeW1ib2wtZmlsZSIgb3IgImZpbGUiIGNvbW1hbmQpLiAgKi8KIAo= --000e0cd290401e2e1404711c74f8--