|
 |
61cf7dc |
diff -up frysk-0.4/frysk-common/Makefile.rules.sodwfl frysk-0.4/frysk-common/Makefile.rules
|
|
|
61cf7dc |
--- frysk-0.4/frysk-common/Makefile.rules.sodwfl 2010-03-24 19:58:07.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-common/Makefile.rules 2010-03-24 21:52:51.000000000 -0400
|
|
|
61cf7dc |
@@ -164,16 +164,9 @@ AM_CXXFLAGS = \
|
|
|
61cf7dc |
-I$(srcdir) \
|
|
|
61cf7dc |
-I$(srcdir)/../frysk-imports/include \
|
|
|
61cf7dc |
-I$(top_builddir) \
|
|
|
61cf7dc |
- -I$(srcdir)/../frysk-imports/elfutils/libasm \
|
|
|
61cf7dc |
- -I$(srcdir)/../frysk-imports/elfutils/libebl \
|
|
|
61cf7dc |
- -I$(srcdir)/../frysk-imports/elfutils/libelf \
|
|
|
61cf7dc |
- -I$(srcdir)/../frysk-imports/elfutils/libdw \
|
|
|
61cf7dc |
- -I$(srcdir)/../frysk-imports/elfutils/libdwfl \
|
|
|
61cf7dc |
+ -I/usr/include/elfutils \
|
|
|
61cf7dc |
-I$(srcdir)/../frysk-imports/libunwind/include \
|
|
|
61cf7dc |
- -I$(top_builddir)/../frysk-imports/libunwind-i386/include \
|
|
|
61cf7dc |
- -I$(top_builddir)/../frysk-imports/libunwind-x86_64/include \
|
|
|
61cf7dc |
- -I$(top_builddir)/../frysk-imports/libunwind-ppc64/include \
|
|
|
61cf7dc |
- -I$(top_builddir)/../frysk-imports/libunwind-ppc32/include \
|
|
|
61cf7dc |
+ -I$(top_builddir)/../frysk-imports/libunwind/include \
|
|
|
61cf7dc |
-fPIC \
|
|
|
61cf7dc |
$(ZZZ)
|
|
|
61cf7dc |
|
|
|
61cf7dc |
@@ -399,12 +392,10 @@ Runner:
|
|
|
61cf7dc |
echo "#!/bin/sh" >> $@.tmp
|
|
|
61cf7dc |
echo "" >> $@.tmp
|
|
|
61cf7dc |
echo "# some pre-definitions" >> $@.tmp
|
|
|
61cf7dc |
- echo "elfutils=$(frysk_imports)/elfutils" >> $@.tmp
|
|
|
61cf7dc |
echo "java=\"$(JAVA) $(GEN_GCJ_NO_SIGCHLD_FLAGS)\"" >> $@.tmp
|
|
|
61cf7dc |
echo "" >> $@.tmp
|
|
|
61cf7dc |
echo "# hack to hopefully find the right libstdc++.so" >> $@.tmp
|
|
|
61cf7dc |
echo "export LD_LIBRARY_PATH=$(frysk_sys)\\" >> $@.tmp
|
|
|
61cf7dc |
- echo ":\$${elfutils}/backends\\" >> $@.tmp
|
|
|
61cf7dc |
echo ":/usr/lib64:/usr/lib" >> $@.tmp
|
|
|
61cf7dc |
echo "" >> $@.tmp
|
|
|
61cf7dc |
echo "# Set up classpath" >> $@.tmp
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-core/Makefile.am.sodwfl frysk-0.4/frysk-core/Makefile.am
|
|
|
61cf7dc |
--- frysk-0.4/frysk-core/Makefile.am.sodwfl 2010-03-24 22:12:26.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-core/Makefile.am 2010-03-24 22:13:13.000000000 -0400
|
|
|
61cf7dc |
@@ -53,11 +53,6 @@ GEN_GCJ_LDADD_LIST += ../frysk-imports/l
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-junit.a
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-getopt.a
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-jdom.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libasm/libasm.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libdwfl/libdwfl.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libdw/libdw.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libebl/libebl.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libelf/libelf.a
|
|
|
61cf7dc |
if USE_LIBUNWIND
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += ../frysk-imports/libunwind-i386/src/.libs/libunwind-x86.a \
|
|
|
61cf7dc |
../frysk-imports/libunwind-x86_64/src/.libs/libunwind-x86_64.a \
|
|
|
61cf7dc |
@@ -68,6 +63,7 @@ GEN_GCJ_LDADD_LIST += -lstdc++
|
|
|
61cf7dc |
# Stub bfd_getb32 and bfd_getl32 for PPC64. Unconditionally
|
|
|
61cf7dc |
# link -lbfd_get just for simplification.
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += -laudit
|
|
|
61cf7dc |
+GEN_GCJ_LDADD_LIST += -lasm -ldw -lebl -lelf
|
|
|
61cf7dc |
|
|
|
61cf7dc |
# For TestExec.java
|
|
|
61cf7dc |
pkglib_PROGRAMS += frysk/pkglibdir/funit-exec-alias
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-gtk/Makefile.am.sodwfl frysk-0.4/frysk-gtk/Makefile.am
|
|
|
61cf7dc |
--- frysk-0.4/frysk-gtk/Makefile.am.sodwfl 2010-03-24 22:15:40.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-gtk/Makefile.am 2010-03-24 22:16:36.000000000 -0400
|
|
|
61cf7dc |
@@ -51,11 +51,6 @@ GEN_GCJ_LDADD_LIST += ../frysk-sys/libfr
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-junit.a
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-getopt.a
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += $(FRYSK_GTK_LIBS)
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libasm/libasm.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libdwfl/libdwfl.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libdw/libdw.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libebl/libebl.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libelf/libelf.a
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += \
|
|
|
61cf7dc |
../frysk-imports/libunwind-i386/src/.libs/libunwind-x86.a \
|
|
|
61cf7dc |
../frysk-imports/libunwind-x86_64/src/.libs/libunwind-x86_64.a \
|
|
|
61cf7dc |
@@ -64,6 +59,7 @@ GEN_GCJ_LDADD_LIST += \
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += -lstdc++
|
|
|
61cf7dc |
# For auditing
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += -laudit
|
|
|
61cf7dc |
+GEN_GCJ_LDADD_LIST += -lasm -ldw -lebl -lelf
|
|
|
61cf7dc |
|
|
|
61cf7dc |
# Hack, need to compile this entire sub-tree with JNI.
|
|
|
61cf7dc |
AM_GCJFLAGS += -fjni
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-gui/Makefile.am.sodwfl frysk-0.4/frysk-gui/Makefile.am
|
|
|
61cf7dc |
--- frysk-0.4/frysk-gui/Makefile.am.sodwfl 2010-03-24 22:15:44.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-gui/Makefile.am 2010-03-24 22:16:21.000000000 -0400
|
|
|
61cf7dc |
@@ -60,11 +60,6 @@ GEN_GCJ_LDADD_LIST += ../frysk-imports/l
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-junit.a
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-getopt.a
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-jline.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libasm/libasm.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libdwfl/libdwfl.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libdw/libdw.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libebl/libebl.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libelf/libelf.a
|
|
|
61cf7dc |
if USE_LIBUNWIND
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += ../frysk-imports/libunwind-i386/src/.libs/libunwind-x86.a \
|
|
|
61cf7dc |
../frysk-imports/libunwind-x86_64/src/.libs/libunwind-x86_64.a \
|
|
|
61cf7dc |
@@ -77,6 +72,7 @@ GEN_GCJ_LDADD_LIST += -L../frysk-gtk/Egg
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += -L../frysk-gtk/tlwidgets
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += $(FRYSK_GUI_LIBS)
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += -laudit
|
|
|
61cf7dc |
+GEN_GCJ_LDADD_LIST += -lasm -ldw -lebl -lelf
|
|
|
61cf7dc |
|
|
|
61cf7dc |
# Skip the JUnit tests (exit with status 77) when there is no display; bug #3012.
|
|
|
61cf7dc |
#TESTS_ENVIRONMENT = ( test $$tst != TestRunner || test -n "$$DISPLAY" || exit 77 ) &&
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-imports/bootstrap.sh.sodwfl frysk-0.4/frysk-imports/bootstrap.sh
|
|
|
61cf7dc |
--- frysk-0.4/frysk-imports/bootstrap.sh.sodwfl 2008-06-09 14:03:07.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-imports/bootstrap.sh 2010-03-24 19:58:07.000000000 -0400
|
|
|
61cf7dc |
@@ -51,18 +51,6 @@ FILE_LIST="\
|
|
|
61cf7dc |
./common/Makefile.gen.sh $FILE_LIST
|
|
|
61cf7dc |
|
|
|
61cf7dc |
(
|
|
|
61cf7dc |
- cd elfutils
|
|
|
61cf7dc |
- echo "Running aclocal ... for elfutils"
|
|
|
61cf7dc |
- aclocal -I m4
|
|
|
61cf7dc |
- echo "Running autoconf ... for elfutils"
|
|
|
61cf7dc |
- autoconf -Werror
|
|
|
61cf7dc |
- echo "Running autoheader ... for elfutils"
|
|
|
61cf7dc |
- autoheader -Werror
|
|
|
61cf7dc |
- echo "Running automake ... for elfutils"
|
|
|
61cf7dc |
- automake -Werror --add-missing
|
|
|
61cf7dc |
-)
|
|
|
61cf7dc |
-
|
|
|
61cf7dc |
-(
|
|
|
61cf7dc |
cd antlr
|
|
|
61cf7dc |
echo "Running autoconf ... for antlr"
|
|
|
61cf7dc |
autoconf -Werror -f
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-imports/configure.ac.sodwfl frysk-0.4/frysk-imports/configure.ac
|
|
|
61cf7dc |
--- frysk-0.4/frysk-imports/configure.ac.sodwfl 2008-06-09 14:03:07.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-imports/configure.ac 2010-03-24 19:58:07.000000000 -0400
|
|
|
61cf7dc |
@@ -61,6 +61,6 @@ AC_CONFIG_FILES([
|
|
|
61cf7dc |
# list of configured subdirectories so that it can be included in
|
|
|
61cf7dc |
# "make dist" (or the recursive "make distdir").
|
|
|
61cf7dc |
|
|
|
61cf7dc |
-AC_CONFIG_SUBDIRS([elfutils libunwind libunwind-i386 libunwind-x86_64 libunwind-ppc32 libunwind-ppc64])
|
|
|
61cf7dc |
+AC_CONFIG_SUBDIRS([libunwind libunwind-i386 libunwind-x86_64 libunwind-ppc32 libunwind-ppc64])
|
|
|
61cf7dc |
|
|
|
61cf7dc |
AC_OUTPUT
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-imports/Makefile.am.sodwfl frysk-0.4/frysk-imports/Makefile.am
|
|
|
61cf7dc |
--- frysk-0.4/frysk-imports/Makefile.am.sodwfl 2008-06-09 14:03:07.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-imports/Makefile.am 2010-03-24 19:58:07.000000000 -0400
|
|
|
61cf7dc |
@@ -58,7 +58,6 @@ LIBUNWIND_ARCH_DIRS = libunwind-i386 lib
|
|
|
61cf7dc |
CHECK_SUBDIRS = \
|
|
|
61cf7dc |
jline \
|
|
|
61cf7dc |
junit \
|
|
|
61cf7dc |
- elfutils \
|
|
|
61cf7dc |
getopt \
|
|
|
61cf7dc |
tests \
|
|
|
61cf7dc |
$(LIBUNWIND_DIR)
|
|
|
61cf7dc |
@@ -86,11 +85,6 @@ GEN_CLASSPATH += getopt.jar
|
|
|
61cf7dc |
GEN_CLASSPATH += junit.jar
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += libfrysk-getopt.a
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += libfrysk-junit.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ./elfutils/libasm/libasm.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ./elfutils/libdwfl/libdwfl.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ./elfutils/libdw/libdw.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ./elfutils/libebl/libebl.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ./elfutils/libelf/libelf.a
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += -lstdc++
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += ./libunwind-i386/src/.libs/libunwind-x86.a
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += ./libunwind-x86_64/src/.libs/libunwind-x86_64.a
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-imports/tests/Makefile.am.sodwfl frysk-0.4/frysk-imports/tests/Makefile.am
|
|
|
61cf7dc |
--- frysk-0.4/frysk-imports/tests/Makefile.am.sodwfl 2008-06-09 14:03:07.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-imports/tests/Makefile.am 2010-03-24 19:58:07.000000000 -0400
|
|
|
61cf7dc |
@@ -463,7 +463,6 @@ systests_PASS_PROGRAM += frysk4217/attac
|
|
|
61cf7dc |
systests_PASS_PROGRAM += frysk4330/stopkills
|
|
|
61cf7dc |
|
|
|
61cf7dc |
# test if /proc/PID/maps has r-xp permissions for the VDSO entry
|
|
|
61cf7dc |
-frysk4704_vdso_permissions_CFLAGS = -I$(top_srcdir)/elfutils/libelf
|
|
|
61cf7dc |
systests_PASS_PROGRAM += frysk4704/vdso-permissions
|
|
|
61cf7dc |
|
|
|
61cf7dc |
# A final variable/inner class test.
|
|
|
61cf7dc |
@@ -486,10 +485,6 @@ frysk4742/java.sh:
|
|
|
61cf7dc |
\| grep Referee > $@
|
|
|
61cf7dc |
chmod a+x $@
|
|
|
61cf7dc |
|
|
|
61cf7dc |
-frysk4796_dwfltest_CFLAGS = -I$(top_srcdir)/elfutils/libdwfl \
|
|
|
61cf7dc |
--I$(top_srcdir)/elfutils/libdw -I$(top_srcdir)/elfutils/libelf
|
|
|
61cf7dc |
-frysk4796_dwfltest_LDADD = -ldl $(top_builddir)/elfutils/libasm/libasm.a \
|
|
|
61cf7dc |
-$(top_builddir)/elfutils/libdw/libdw.a \
|
|
|
61cf7dc |
-$(top_builddir)/elfutils/libebl/libebl.a \
|
|
|
61cf7dc |
-$(top_builddir)/elfutils/libelf/libelf.a
|
|
|
61cf7dc |
+frysk4796_dwfltest_LDADD = -ldl -lasm -ldw -lebl -lelf
|
|
|
61cf7dc |
+frysk4796_dwfltest_CFLAGS = -I/usr/include/elfutils
|
|
|
61cf7dc |
systests_PASS_PROGRAM += frysk4796/dwfltest
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-sys/lib/dwfl/cni/DwarfDie.cxx.sodwfl frysk-0.4/frysk-sys/lib/dwfl/cni/DwarfDie.cxx
|
|
|
61cf7dc |
--- frysk-0.4/frysk-sys/lib/dwfl/cni/DwarfDie.cxx.sodwfl 2010-03-24 21:49:32.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-sys/lib/dwfl/cni/DwarfDie.cxx 2010-03-24 21:49:53.000000000 -0400
|
|
|
61cf7dc |
@@ -36,9 +36,10 @@
|
|
|
61cf7dc |
// modification, you must delete this exception statement from your
|
|
|
61cf7dc |
// version and license this file solely under the GPL without
|
|
|
61cf7dc |
// exception.
|
|
|
61cf7dc |
-#include <libdw.h>
|
|
|
61cf7dc |
+
|
|
|
61cf7dc |
+#include <elfutils/libdw.h>
|
|
|
61cf7dc |
#include <gcj/cni.h>
|
|
|
61cf7dc |
-#include <dwarf.h>
|
|
|
61cf7dc |
+#include <elfutils/../dwarf.h>
|
|
|
61cf7dc |
#include <stdio.h>
|
|
|
61cf7dc |
#include <alloca.h>
|
|
|
61cf7dc |
#include <stdlib.h>
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-sys/lib/dwfl/DwAccess.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwAccess.shenum
|
|
|
61cf7dc |
--- frysk-0.4/frysk-sys/lib/dwfl/DwAccess.shenum.sodwfl 2010-03-24 20:13:34.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-sys/lib/dwfl/DwAccess.shenum 2010-03-24 22:08:31.000000000 -0400
|
|
|
61cf7dc |
@@ -42,7 +42,7 @@
|
|
|
61cf7dc |
# in.
|
|
|
61cf7dc |
|
|
|
61cf7dc |
CC=${CC:-gcc}
|
|
|
61cf7dc |
-$CC -dD -E $(dirname $0)/../../../frysk-imports/elfutils/libdw/dwarf.h | awk '
|
|
|
61cf7dc |
+$CC -dD -E /usr/include/dwarf.h | awk '
|
|
|
61cf7dc |
/DW_ACCESS_.* = / {
|
|
|
61cf7dc |
p = $1
|
|
|
61cf7dc |
v = gensub(",","","",$3)
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-sys/lib/dwfl/DwAte.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwAte.shenum
|
|
|
61cf7dc |
--- frysk-0.4/frysk-sys/lib/dwfl/DwAte.shenum.sodwfl 2010-03-24 20:14:07.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-sys/lib/dwfl/DwAte.shenum 2010-03-24 20:14:22.000000000 -0400
|
|
|
61cf7dc |
@@ -42,7 +42,7 @@
|
|
|
61cf7dc |
# in.
|
|
|
61cf7dc |
|
|
|
61cf7dc |
CC=${CC:-gcc}
|
|
|
61cf7dc |
-$CC -dD -E $(dirname $0)/../../../frysk-imports/elfutils/libdw/dwarf.h | awk '
|
|
|
61cf7dc |
+$CC -dD -E /usr/include/dwarf.h | awk '
|
|
|
61cf7dc |
/DW_ATE_.* = / {
|
|
|
61cf7dc |
p = $1
|
|
|
61cf7dc |
v = gensub(",","","",$3)
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-sys/lib/dwfl/DwAt.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwAt.shenum
|
|
|
61cf7dc |
--- frysk-0.4/frysk-sys/lib/dwfl/DwAt.shenum.sodwfl 2010-03-24 20:11:25.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-sys/lib/dwfl/DwAt.shenum 2010-03-24 20:11:49.000000000 -0400
|
|
|
61cf7dc |
@@ -42,7 +42,7 @@
|
|
|
61cf7dc |
# in.
|
|
|
61cf7dc |
|
|
|
61cf7dc |
CC=${CC:-gcc}
|
|
|
61cf7dc |
-$CC -dD -E $(dirname $0)/../../../frysk-imports/elfutils/libdw/dwarf.h | awk '
|
|
|
61cf7dc |
+$CC -dD -E /usr/include/dwarf.h | awk '
|
|
|
61cf7dc |
/DW_AT_.* = / {
|
|
|
61cf7dc |
p = $1
|
|
|
61cf7dc |
v = gensub(",","","",$3)
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-sys/lib/dwfl/DwDsc.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwDsc.shenum
|
|
|
61cf7dc |
--- frysk-0.4/frysk-sys/lib/dwfl/DwDsc.shenum.sodwfl 2010-03-24 20:17:00.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-sys/lib/dwfl/DwDsc.shenum 2010-03-24 20:17:24.000000000 -0400
|
|
|
61cf7dc |
@@ -42,7 +42,7 @@
|
|
|
61cf7dc |
# in.
|
|
|
61cf7dc |
|
|
|
61cf7dc |
CC=${CC:-gcc}
|
|
|
61cf7dc |
-$CC -dD -E $(dirname $0)/../../../frysk-imports/elfutils/libdw/dwarf.h | awk '
|
|
|
61cf7dc |
+$CC -dD -E /usr/include/dwarf.h | awk '
|
|
|
61cf7dc |
/DW_DSC_.* = / {
|
|
|
61cf7dc |
p = $1
|
|
|
61cf7dc |
v = gensub(",","","",$3)
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-sys/lib/dwfl/DwDs.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwDs.shenum
|
|
|
61cf7dc |
--- frysk-0.4/frysk-sys/lib/dwfl/DwDs.shenum.sodwfl 2010-03-24 20:16:10.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-sys/lib/dwfl/DwDs.shenum 2010-03-24 20:16:28.000000000 -0400
|
|
|
61cf7dc |
@@ -42,7 +42,7 @@
|
|
|
61cf7dc |
# in.
|
|
|
61cf7dc |
|
|
|
61cf7dc |
CC=${CC:-gcc}
|
|
|
61cf7dc |
-$CC -dD -E $(dirname $0)/../../../frysk-imports/elfutils/libdw/dwarf.h | awk '
|
|
|
61cf7dc |
+$CC -dD -E /usr/include/dwarf.h | awk '
|
|
|
61cf7dc |
/DW_DS_.* = / {
|
|
|
61cf7dc |
p = $1
|
|
|
61cf7dc |
v = gensub(",","","",$3)
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-sys/lib/dwfl/DwEnd.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwEnd.shenum
|
|
|
61cf7dc |
--- frysk-0.4/frysk-sys/lib/dwfl/DwEnd.shenum.sodwfl 2010-03-24 20:18:38.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-sys/lib/dwfl/DwEnd.shenum 2010-03-24 20:18:53.000000000 -0400
|
|
|
61cf7dc |
@@ -42,7 +42,7 @@
|
|
|
61cf7dc |
# in.
|
|
|
61cf7dc |
|
|
|
61cf7dc |
CC=${CC:-gcc}
|
|
|
61cf7dc |
-$CC -dD -E $(dirname $0)/../../../frysk-imports/elfutils/libdw/dwarf.h | awk '
|
|
|
61cf7dc |
+$CC -dD -E /usr/include/dwarf.h | awk '
|
|
|
61cf7dc |
/DW_END_.* = / {
|
|
|
61cf7dc |
p = $1
|
|
|
61cf7dc |
v = gensub(",","","",$3)
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-sys/lib/dwfl/DwInl.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwInl.shenum
|
|
|
61cf7dc |
--- frysk-0.4/frysk-sys/lib/dwfl/DwInl.shenum.sodwfl 2010-03-24 20:08:28.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-sys/lib/dwfl/DwInl.shenum 2010-03-24 20:09:47.000000000 -0400
|
|
|
61cf7dc |
@@ -42,7 +42,7 @@
|
|
|
61cf7dc |
# in.
|
|
|
61cf7dc |
|
|
|
61cf7dc |
CC=${CC:-gcc}
|
|
|
61cf7dc |
-$CC -dD -E $(dirname $0)/../../../frysk-imports/elfutils/libdw/dwarf.h | awk '
|
|
|
61cf7dc |
+$CC -dD -E /usr/include/dwarf.h | awk '
|
|
|
61cf7dc |
/DW_INL_.* = / {
|
|
|
61cf7dc |
p = $1
|
|
|
61cf7dc |
v = gensub(",","","",$3)
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-sys/lib/dwfl/DwOp.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwOp.shenum
|
|
|
61cf7dc |
--- frysk-0.4/frysk-sys/lib/dwfl/DwOp.shenum.sodwfl 2010-03-24 20:17:35.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-sys/lib/dwfl/DwOp.shenum 2010-03-24 20:23:06.000000000 -0400
|
|
|
61cf7dc |
@@ -42,7 +42,8 @@
|
|
|
61cf7dc |
# in.
|
|
|
61cf7dc |
|
|
|
61cf7dc |
CC=${CC:-gcc}
|
|
|
61cf7dc |
-$CC -dD -E $(dirname $0)/../../../frysk-imports/elfutils/libdw/dwarf.h | awk '
|
|
|
61cf7dc |
+$CC -dD -E /usr/include/dwarf.h | awk '
|
|
|
61cf7dc |
+ /lo_user/ || /hi_user/ { next }
|
|
|
61cf7dc |
/DW_OP_.* = / {
|
|
|
61cf7dc |
p = $1
|
|
|
61cf7dc |
v = gensub(",","","",$3)
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-sys/lib/dwfl/DwOrd.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwOrd.shenum
|
|
|
61cf7dc |
--- frysk-0.4/frysk-sys/lib/dwfl/DwOrd.shenum.sodwfl 2010-03-24 20:15:46.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-sys/lib/dwfl/DwOrd.shenum 2010-03-24 20:15:59.000000000 -0400
|
|
|
61cf7dc |
@@ -42,7 +42,7 @@
|
|
|
61cf7dc |
# in.
|
|
|
61cf7dc |
|
|
|
61cf7dc |
CC=${CC:-gcc}
|
|
|
61cf7dc |
-$CC -dD -E $(dirname $0)/../../../frysk-imports/elfutils/libdw/dwarf.h | awk '
|
|
|
61cf7dc |
+$CC -dD -E /usr/include/dwarf.h | awk '
|
|
|
61cf7dc |
/DW_ORD_.* = / {
|
|
|
61cf7dc |
p = $1
|
|
|
61cf7dc |
v = gensub(",","","",$3)
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-sys/lib/dwfl/DwTag.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwTag.shenum
|
|
|
61cf7dc |
--- frysk-0.4/frysk-sys/lib/dwfl/DwTag.shenum.sodwfl 2010-03-24 20:11:19.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-sys/lib/dwfl/DwTag.shenum 2010-03-24 20:12:11.000000000 -0400
|
|
|
61cf7dc |
@@ -42,7 +42,7 @@
|
|
|
61cf7dc |
# in.
|
|
|
61cf7dc |
|
|
|
61cf7dc |
CC=${CC:-gcc}
|
|
|
61cf7dc |
-$CC -dD -E $(dirname $0)/../../../frysk-imports/elfutils/libdw/dwarf.h | awk '
|
|
|
61cf7dc |
+$CC -dD -E /usr/include/dwarf.h | awk '
|
|
|
61cf7dc |
/DW_TAG_/ {
|
|
|
61cf7dc |
p = $1
|
|
|
61cf7dc |
v = gensub(",","","",$3)
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-sys/lib/dwfl/jni/DwarfDie.cxx.sodwfl frysk-0.4/frysk-sys/lib/dwfl/jni/DwarfDie.cxx
|
|
|
61cf7dc |
--- frysk-0.4/frysk-sys/lib/dwfl/jni/DwarfDie.cxx.sodwfl 2010-03-24 21:45:24.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-sys/lib/dwfl/jni/DwarfDie.cxx 2010-03-24 21:46:01.000000000 -0400
|
|
|
61cf7dc |
@@ -40,8 +40,8 @@
|
|
|
61cf7dc |
#include <stdio.h>
|
|
|
61cf7dc |
#include <stdlib.h>
|
|
|
61cf7dc |
|
|
|
61cf7dc |
-#include <libdw.h>
|
|
|
61cf7dc |
-#include <dwarf.h>
|
|
|
61cf7dc |
+#include <elfutils/libdw.h>
|
|
|
61cf7dc |
+#include <elfutils/../dwarf.h>
|
|
|
61cf7dc |
|
|
|
61cf7dc |
#include "jni.hxx"
|
|
|
61cf7dc |
|
|
|
61cf7dc |
diff -up frysk-0.4/frysk-sys/Makefile.am.sodwfl frysk-0.4/frysk-sys/Makefile.am
|
|
|
61cf7dc |
--- frysk-0.4/frysk-sys/Makefile.am.sodwfl 2010-03-24 20:04:31.000000000 -0400
|
|
|
61cf7dc |
+++ frysk-0.4/frysk-sys/Makefile.am 2010-03-24 21:56:41.000000000 -0400
|
|
|
61cf7dc |
@@ -53,11 +53,6 @@ GEN_GCJ_LDADD_LIST += ../frysk-imports/l
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-junit.a
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-getopt.a
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-jdom.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libasm/libasm.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libdwfl/libdwfl.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libdw/libdw.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libebl/libebl.a
|
|
|
61cf7dc |
-GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libelf/libelf.a
|
|
|
61cf7dc |
if USE_LIBUNWIND
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += ../frysk-imports/libunwind-i386/src/.libs/libunwind-x86.a \
|
|
|
61cf7dc |
../frysk-imports/libunwind-x86_64/src/.libs/libunwind-x86_64.a \
|
|
|
61cf7dc |
@@ -65,6 +60,8 @@ GEN_GCJ_LDADD_LIST += ../frysk-imports/l
|
|
|
61cf7dc |
../frysk-imports/libunwind-ppc64/src/.libs/libunwind-ppc64.a
|
|
|
61cf7dc |
endif
|
|
|
61cf7dc |
GEN_GCJ_LDADD_LIST += -lstdc++ -laudit
|
|
|
61cf7dc |
+GEN_GCJ_LDADD_LIST += -lasm -ldw -lebl -lelf
|
|
|
61cf7dc |
+
|
|
|
61cf7dc |
|
|
|
61cf7dc |
# Force a few dependencies
|
|
|
61cf7dc |
lib/unwind/cni/Unwind%.cxx: lib/unwind/Unwind%.java lib/unwind/cni/UnwindH.hxx
|
|
|
61cf7dc |
@@ -74,12 +71,6 @@ lib/unwind/Unwind%.java: lib/unwind/Unwi
|
|
|
61cf7dc |
# Depend on these runtimes.
|
|
|
61cf7dc |
JNI_LIBRARY_LIST += -lstdc++
|
|
|
61cf7dc |
JNI_LIBRARY_LIST += -laudit
|
|
|
61cf7dc |
-# Bundle in the local elfutils code.
|
|
|
61cf7dc |
-JNI_ARCHIVE_LIST += ../frysk-imports/elfutils/libasm/libasm_pic.a
|
|
|
61cf7dc |
-JNI_ARCHIVE_LIST += ../frysk-imports/elfutils/libdwfl/libdwfl_pic.a
|
|
|
61cf7dc |
-JNI_ARCHIVE_LIST += ../frysk-imports/elfutils/libdw/libdw_pic.a
|
|
|
61cf7dc |
-JNI_ARCHIVE_LIST += ../frysk-imports/elfutils/libelf/libelf_pic.a
|
|
|
61cf7dc |
-JNI_ARCHIVE_LIST += ../frysk-imports/elfutils/libebl/libebl.a
|
|
|
61cf7dc |
# Bundle in the local libunwind code.
|
|
|
61cf7dc |
JNI_OBJECT_LIST += ../frysk-imports/libunwind-i386/src/{,dwarf/,mi/,x86/}.libs/*.o
|
|
|
61cf7dc |
JNI_OBJECT_LIST += ../frysk-imports/libunwind-x86_64/src/{,dwarf/,mi/,x86_64/}.libs/*.o
|