summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2006-05-11 22:20:07 +0000
committerbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2006-05-11 22:20:07 +0000
commite7c3620fcd38935dcfbe29ce9f0a9922f377d9fd (patch)
treeabcecba4f2cabd5f79274d6ddfbbea0fc35a9681 /libjava
parent8ff0d590a6f7efd67a48c79d2e84551c03c86861 (diff)
downloadgcc-e7c3620fcd38935dcfbe29ce9f0a9922f377d9fd.tar.gz
2006-05-11 Bryce McKinlay <mckinlay@redhat.com>
* gnu/gcj/runtime/NameFinder.java (lookup): If exec'ing addr2line fails, don't try again. (use_addr2line): Field no longer final. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113715 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/gnu/gcj/runtime/NameFinder.java9
2 files changed, 12 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index fa8be5db688..aea1ae6a0bc 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,11 @@
2006-05-11 Bryce McKinlay <mckinlay@redhat.com>
+ * gnu/gcj/runtime/NameFinder.java (lookup): If exec'ing addr2line
+ fails, don't try again.
+ (use_addr2line): Field no longer final.
+
+2006-05-11 Bryce McKinlay <mckinlay@redhat.com>
+
* gnu/gcj/runtime/NameFinder.java (blacklist): New static field.
(lookup): If addr2line fails to find an address, flag the binary as
having no debug info and avoid calling addr2line on it again.
diff --git a/libjava/gnu/gcj/runtime/NameFinder.java b/libjava/gnu/gcj/runtime/NameFinder.java
index bfc3e25d345..e43886feb4c 100644
--- a/libjava/gnu/gcj/runtime/NameFinder.java
+++ b/libjava/gnu/gcj/runtime/NameFinder.java
@@ -62,7 +62,7 @@ public class NameFinder
*/
private static Set blacklist = Collections.synchronizedSet(new HashSet());
- private static final boolean use_addr2line
+ private static boolean use_addr2line
= Boolean.valueOf(System.getProperty
("gnu.gcj.runtime.NameFinder.use_addr2line", "true")
).booleanValue();
@@ -166,8 +166,11 @@ public class NameFinder
procs.put(file, addr2line);
}
- if (addr2line.proc == null)
- return;
+ if (addr2line.proc == null)
+ {
+ use_addr2line = false;
+ return;
+ }
String hexAddr = "0x" + Long.toHexString(addr);
String name;