This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: Debuginfo for ecj branch
- From: Andrew Haley <aph at redhat dot com>
- To: java-patches at gcc dot gnu dot org, gcc-patches at gcc dot gnu dot org
- Date: Fri, 7 Jul 2006 18:24:23 +0100
- Subject: Re: Debuginfo for ecj branch
- References: <17582.20857.475902.287644@zebedee.pink>
My patch had a bug. Also, it wasn't being used for the libgcj build;
fixed thusly.
Andrew.
2006-07-07 Andrew Haley <aph@redhat.com>
* Makefile.am: Use -fsource-filename when compiling libgcj.
* Makefile.in: Regenerate.
Index: Makefile.am
===================================================================
--- Makefile.am (revision 115254)
+++ Makefile.am (working copy)
@@ -324,7 +324,7 @@
## Compiling a list of java sources to a single .o.
%.lo: %.list
- $(LTGCJCOMPILE) -c -o $@ -MT $@ -MD -MP -MF $(basename $@).deps @$<
+ $(LTGCJCOMPILE) -c -o $@ -fsource-filename=$(here)/classpath/lib/classes -MT $@ -MD -MP -MF $(basename $@).deps @$<
java/lang/Object.lo: classpath/lib/java/lang/Object.class
$(LTGCJCOMPILE) -c -o $@ $<
2006-07-07 Andrew Haley <aph@redhat.com>
(set_source_filename): Don't check for CLASS_FROM_CURRENTLY_COMPILED_P.
Remove // comments.
Index: jcf-parse.c
===================================================================
--- jcf-parse.c (revision 115256)
+++ jcf-parse.c (working copy)
@@ -178,8 +178,8 @@
- strlen (".java")),
".java") != 0)
{
- // fsource_filename isn't a .java file but a list of filenames
- // separated by newlines
+/* fsource_filename isn't a .java file but a list of filenames
+ separated by newlines */
FILE *finput = fopen (fsource_filename, "r");
int len = 0;
int longest_line = 0;
@@ -324,10 +324,7 @@
|| old_filename[old_len - new_len - 1] == '\\'))
{
#ifndef USE_MAPPED_LOCATION
- if (CLASS_FROM_CURRENTLY_COMPILED_P (current_class))
- // if we're generating code for this class, try to find
- // its full pathname
- input_filename = find_sourcefile (input_filename);
+ input_filename = find_sourcefile (input_filename);
DECL_SOURCE_LOCATION (TYPE_NAME (current_class)) = input_location;
file_start_location = input_location;
#endif
@@ -361,10 +358,7 @@
}
}
- if (CLASS_FROM_CURRENTLY_COMPILED_P (current_class))
- // if we're generating code for this class, try to find its full
- // pathname
- sfname = find_sourcefile (sfname);
+ sfname = find_sourcefile (sfname);
#ifdef USE_MAPPED_LOCATION
line_table.maps[line_table.used-1].to_file = sfname;
#else