blob: 9ace9dfb28ac346c1f206c4beef7daf5bc9862ea (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
#! /bin/sh -e
# DP: libgcj: Lookup source file name and line number in separated
# DP: debug files found in /usr/lib/debug
dir=
if [ $# -eq 3 -a "$2" = '-d' ]; then
pdir="-d $3"
dir="$3/"
elif [ $# -ne 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
case "$1" in
-patch)
patch $pdir -f --no-backup-if-mismatch -p0 < $0
;;
-unpatch)
patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
esac
exit 0
--- libjava/stacktrace.cc.orig 2006-06-16 13:54:07.078577632 +0200
+++ libjava/stacktrace.cc 2006-06-16 13:56:08.032189888 +0200
@@ -20,6 +20,11 @@
#endif
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#include <java/lang/Class.h>
#include <java/lang/Long.h>
@@ -222,6 +227,28 @@
finder->lookup (binaryName, (jlong) offset);
*sourceFileName = finder->getSourceFile();
*lineNum = finder->getLineNum();
+ if (*lineNum == -1 && info.file_name[0] == '/')
+ {
+ const char *debugPrefix = "/usr/lib/debug";
+ char *debugPath = (char *) malloc (strlen(debugPrefix)
+ + strlen(info.file_name)
+ + 2);
+
+ if (debugPath)
+ {
+ strcpy (debugPath, debugPrefix);
+ strcat (debugPath, info.file_name);
+ //printf ("%s: 0x%x\n", debugPath, offset);
+ if (!access (debugPath, R_OK))
+ {
+ binaryName = JvNewStringUTF (debugPath);
+ finder->lookup (binaryName, (jlong) offset);
+ *sourceFileName = finder->getSourceFile();
+ *lineNum = finder->getLineNum();
+ }
+ free (debugPath);
+ }
+ }
if (*lineNum == -1 && NameFinder::showRaw())
{
gnu::gcj::runtime::StringBuffer *t =
|
