It wasn't possible to debug Classpath tools because they were built
with no debuginfo. Also, we weren't passing the full source pathnames
to gcj, so gdb couldn't find the source files.
Finally, we weren't passing JAR to Classpath's make.
Andrew.
2006-12-15 Andrew Haley <[EMAIL PROTECTED]>
* Makefile.am (AM_MAKEFLAGS): Pass JAR to sub-make.
(libgcj_tools_la_GCJFLAGS): Pass -fsource-filename to gcj.
2006-12-15 Andrew Haley <[EMAIL PROTECTED]>
* tools/Makefile.am (TOOLS_ZIP): Pass -g -w to javac.
Create all-classes.lst that contains all source filenames.
Delete asm.lst.
Index: Makefile.am
===================================================================
--- Makefile.am (revision 119819)
+++ Makefile.am (working copy)
@@ -255,7 +255,7 @@
EXTRA_libgcj_la_SOURCES = java/lang/Object.java
libgcj_tools_la_SOURCES = classpath/tools/tools.zip
-libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch
-fno-indirect-classes
+libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch
-fno-indirect-classes -fsource-filename=$(here)/classpath/tools/all-classes.lst
libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec
@@ -1057,7 +1057,8 @@
"NM=$(NM)" \
"PICFLAG=$(PICFLAG)" \
"RANLIB=$(RANLIB)" \
- "DESTDIR=$(DESTDIR)"
+ "DESTDIR=$(DESTDIR)" \
+ "JAR=$(JAR)"
# Subdir rules rely on $(FLAGS_TO_PASS)
FLAGS_TO_PASS = $(AM_MAKEFLAGS)
Index: classpath/tools/Makefile.am
===================================================================
--- classpath/tools/Makefile.am (revision 119819)
+++ classpath/tools/Makefile.am (working copy)
@@ -152,9 +152,10 @@
## Compile ASM separately as it is latin-1 encoded.
find $(srcdir)/external/asm -name '*.java' -print > asm.lst
AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \
- $$AC -d asm @asm.lst
+ $$AC -g -w -d asm @asm.lst
find $(srcdir)/gnu/classpath/tools -name '*.java' -print > classes.lst
- $(JCOMPILER) -d classes @classes.lst
+ $(JCOMPILER) -g -w -d classes @classes.lst
+ cat classes.lst asm.lst > all-classes.lst
## Copy over tools resource files.
@list=`cd $(top_srcdir)/resource && find gnu/classpath/tools -name
\*.properties -print`; \
for p in $$list; do \
@@ -173,7 +174,7 @@
if test "$(ZIP)" != ""; then $(ZIP) -u -r ../$(TOOLS_ZIP) .; fi; \
if test "$(FASTJAR)" != ""; then $(FASTJAR) uf ../$(TOOLS_ZIP) .; fi; \
cd ..)
- rm -rf classes classes.lst
+ rm -rf classes classes.lst asm.lst
# Zip file be gone! (and make sure the classes are gone too)
clean-local:
