/hg/icedtea6: * patches/icedtea-linux-separate-debuginfo.patch: ...

[aph at icedtea.classpath.org]

changeset 638dec038e6f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=638dec038e6f
author: aph
date: Fri Dec 11 16:55:40 2009 +0000

	* patches/icedtea-linux-separate-debuginfo.patch: Add #ifdef
	for NT_GNU_BUILD_ID.


diffstat:

2 files changed, 11 insertions(+), 5 deletions(-)
ChangeLog                                      |    5 +++++
patches/icedtea-linux-separate-debuginfo.patch |   11 ++++++-----

diffs (59 lines):

diff -r 82a9d7f61beb -r 638dec038e6f ChangeLog
--- a/ChangeLog	Thu Dec 10 17:29:39 2009 +0000
+++ b/ChangeLog	Fri Dec 11 16:55:40 2009 +0000
@@ -1,3 +1,8 @@ 2009-12-10  Edward Nevill       <ed at cams
+2009-12-11  Andrew Haley  <aph at redhat.com>
+
+	* patches/icedtea-linux-separate-debuginfo.patch: Add #ifdef
+	for NT_GNU_BUILD_ID.
+
 2009-12-10  Edward Nevill       <ed at camswl.com>
 
 	* cppInterpreter_asm.S
diff -r 82a9d7f61beb -r 638dec038e6f patches/icedtea-linux-separate-debuginfo.patch
--- a/patches/icedtea-linux-separate-debuginfo.patch	Thu Dec 10 17:29:39 2009 +0000
+++ b/patches/icedtea-linux-separate-debuginfo.patch	Fri Dec 11 16:55:40 2009 +0000
@@ -25,9 +25,8 @@ diff -u ../openjdk/icedtea6/openjdk/hots
     if (newlib->symtab == NULL) {
        print_debug("symbol table build failed for %s\n", newlib->name);
     }
-diff -u ../openjdk/icedtea6/openjdk/hotspot/agent/src/os/linux/symtab.c openjdk/hotspot/agent/src/os/linux/symtab.c
---- ../openjdk/icedtea6/openjdk/hotspot/agent/src/os/linux/symtab.c	2009-05-15 00:36:38.000000000 +0100
-+++ openjdk/hotspot/agent/src/os/linux/symtab.c	2009-12-07 13:53:13.107734342 +0000
+--- openjdk/hotspot/agent/src/os/linux/symtab.c	2009-10-14 18:13:08.000000000 +0100
++++ openjdk/hotspot/agent/src/os/linux/symtab.c	2009-12-11 16:16:39.106634861 +0000
 @@ -53,8 +53,272 @@
    struct hsearch_data *hash_table;
  } symtab_t;
@@ -313,12 +312,13 @@ diff -u ../openjdk/icedtea6/openjdk/hots
        if ( (scn_cache[cnt].c_data = read_section_data(fd, &ehdr, cursct)) == NULL) {
           goto quit;
        }
-@@ -163,6 +428,28 @@
+@@ -163,6 +428,30 @@
      }
    }
  
 +  // If we have no symtab in this file, look for a separate debuginfo file
 +  if (try_debuginfo) {
++#ifdef NT_GNU_BUILD_ID
 +    // First we look for a Build ID
 +    for (cursct = shbuf, cnt = 0;
 +	 symtab == NULL && cnt < ehdr.e_shnum;
@@ -331,6 +331,7 @@ diff -u ../openjdk/icedtea6/openjdk/hots
 +      }
 +      cursct++;
 +    }
++#endif
 +
 +    // Then, if that doesn't work, the debug link
 +    if (symtab == NULL) {
@@ -342,7 +343,7 @@ diff -u ../openjdk/icedtea6/openjdk/hots
  quit:
    if (shbuf) free(shbuf);
    if (phbuf) free(phbuf);
-@@ -177,6 +464,11 @@
+@@ -177,6 +466,11 @@
    return symtab;
  }