From 875cba72b4076cecdec61e2a9794522ba3c39119 Mon Sep 17 00:00:00 2001 From: aph Date: Tue, 6 Feb 2007 17:17:03 +0000 Subject: [PATCH] 2007-02-06 Andrew Haley * scripts/makemake.tcl (emit_bc_rule): Set the source filename. * sources.am: Rebuild. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121651 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/scripts/makemake.tcl | 2 +- libjava/sources.am | 52 ++++++++++++++++++++++---------------------- 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4b244ff957c..fbd15bcb7b4 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2007-02-06 Andrew Haley + + * scripts/makemake.tcl (emit_bc_rule): Set the source filename. + * sources.am: Rebuild. + 2007-02-05 Keith Seitz * jvmti.cc (_envListLock): Change type to diff --git a/libjava/scripts/makemake.tcl b/libjava/scripts/makemake.tcl index 127a8e0fe27..78259a32af2 100755 --- a/libjava/scripts/makemake.tcl +++ b/libjava/scripts/makemake.tcl @@ -264,7 +264,7 @@ proc emit_bc_rule {package} { set omit "| grep -v $exclusion_map($package)" } puts "\t@find \$(srcdir)/classpath/lib/$package -name '*.class'${omit} > $tname" - puts "\t\$(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o $loname @$tname" + puts "\t\$(LTGCJCOMPILE) -fsource-filename=\$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o $loname @$tname" puts "\t@rm -f $tname" puts "" diff --git a/libjava/sources.am b/libjava/sources.am index c36eb8d7f15..92b9e62c452 100644 --- a/libjava/sources.am +++ b/libjava/sources.am @@ -166,7 +166,7 @@ classpath/gnu/CORBA/typecodes/StringTypeCode.java gnu-CORBA.lo: $(gnu_CORBA_source_files) @find $(srcdir)/classpath/lib/gnu/CORBA -name '*.class' > gnu-CORBA.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-CORBA.lo @gnu-CORBA.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-CORBA.lo @gnu-CORBA.list @rm -f gnu-CORBA.list gnu_awt_source_files = \ @@ -664,7 +664,7 @@ classpath/gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.java gnu-java-awt-dnd-peer-gtk.lo: $(gnu_java_awt_dnd_peer_gtk_source_files) @find $(srcdir)/classpath/lib/gnu/java/awt/dnd/peer/gtk -name '*.class' > gnu-java-awt-dnd-peer-gtk.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-dnd-peer-gtk.lo @gnu-java-awt-dnd-peer-gtk.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-dnd-peer-gtk.lo @gnu-java-awt-dnd-peer-gtk.list @rm -f gnu-java-awt-dnd-peer-gtk.list gnu_java_awt_font_source_files = \ @@ -847,7 +847,7 @@ classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java gnu-java-awt-peer-gtk.lo: $(gnu_java_awt_peer_gtk_source_files) @find $(srcdir)/classpath/lib/gnu/java/awt/peer/gtk -name '*.class' > gnu-java-awt-peer-gtk.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-gtk.lo @gnu-java-awt-peer-gtk.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-gtk.lo @gnu-java-awt-peer-gtk.list @rm -f gnu-java-awt-peer-gtk.list gnu_java_awt_peer_headless_source_files = \ @@ -910,7 +910,7 @@ classpath/gnu/java/awt/peer/qt/QtWindowPeer.java gnu-java-awt-peer-qt.lo: $(gnu_java_awt_peer_qt_source_files) @find $(srcdir)/classpath/lib/gnu/java/awt/peer/qt -name '*.class' > gnu-java-awt-peer-qt.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-qt.lo @gnu-java-awt-peer-qt.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-qt.lo @gnu-java-awt-peer-qt.list @rm -f gnu-java-awt-peer-qt.list gnu_java_awt_peer_swing_source_files = \ @@ -933,7 +933,7 @@ classpath/gnu/java/awt/peer/swing/SwingWindowPeer.java gnu-java-awt-peer-swing.lo: $(gnu_java_awt_peer_swing_source_files) @find $(srcdir)/classpath/lib/gnu/java/awt/peer/swing -name '*.class' > gnu-java-awt-peer-swing.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-swing.lo @gnu-java-awt-peer-swing.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-swing.lo @gnu-java-awt-peer-swing.list @rm -f gnu-java-awt-peer-swing.list gnu_java_awt_peer_x_source_files = \ @@ -957,7 +957,7 @@ classpath/gnu/java/awt/peer/x/XWindowPeer.java gnu-java-awt-peer-x.lo: $(gnu_java_awt_peer_x_source_files) @find $(srcdir)/classpath/lib/gnu/java/awt/peer/x -name '*.class' > gnu-java-awt-peer-x.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-x.lo @gnu-java-awt-peer-x.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-x.lo @gnu-java-awt-peer-x.list @rm -f gnu-java-awt-peer-x.list gnu_java_awt_print_source_files = \ @@ -1061,7 +1061,7 @@ classpath/gnu/java/beans/encoder/elements/StringReference.java gnu-java-beans.lo: $(gnu_java_beans_source_files) @find $(srcdir)/classpath/lib/gnu/java/beans -name '*.class' > gnu-java-beans.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-beans.lo @gnu-java-beans.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-beans.lo @gnu-java-beans.list @rm -f gnu-java-beans.list gnu_java_io_source_files = \ @@ -2157,7 +2157,7 @@ classpath/gnu/java/util/prefs/gconf/GConfNativePeer.java gnu-java-util-prefs-gconf.lo: $(gnu_java_util_prefs_gconf_source_files) @find $(srcdir)/classpath/lib/gnu/java/util/prefs/gconf -name '*.class' > gnu-java-util-prefs-gconf.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-util-prefs-gconf.lo @gnu-java-util-prefs-gconf.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-util-prefs-gconf.lo @gnu-java-util-prefs-gconf.list @rm -f gnu-java-util-prefs-gconf.list gnu_java_util_regex_source_files = \ @@ -3244,7 +3244,7 @@ classpath/gnu/javax/rmi/CORBA/ValueHandlerDelegateImpl.java gnu-javax-rmi.lo: $(gnu_javax_rmi_source_files) @find $(srcdir)/classpath/lib/gnu/javax/rmi -name '*.class' > gnu-javax-rmi.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-javax-rmi.lo @gnu-javax-rmi.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-javax-rmi.lo @gnu-javax-rmi.list @rm -f gnu-javax-rmi.list gnu_javax_security_auth_source_files = \ @@ -3307,7 +3307,7 @@ classpath/gnu/javax/sound/midi/file/MidiFileWriter.java gnu-javax-sound-midi.lo: $(gnu_javax_sound_midi_source_files) @find $(srcdir)/classpath/lib/gnu/javax/sound/midi -name '*.class' > gnu-javax-sound-midi.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-javax-sound-midi.lo @gnu-javax-sound-midi.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-javax-sound-midi.lo @gnu-javax-sound-midi.list @rm -f gnu-javax-sound-midi.list gnu_javax_sound_sampled_AU_source_files = \ @@ -3520,7 +3520,7 @@ classpath/gnu/xml/aelfred2/XmlReader.java gnu-xml-aelfred2.lo: $(gnu_xml_aelfred2_source_files) @find $(srcdir)/classpath/lib/gnu/xml/aelfred2 -name '*.class' > gnu-xml-aelfred2.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-aelfred2.lo @gnu-xml-aelfred2.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-aelfred2.lo @gnu-xml-aelfred2.list @rm -f gnu-xml-aelfred2.list gnu_xml_dom_source_files = \ @@ -3629,7 +3629,7 @@ classpath/gnu/xml/dom/ls/WriterOutputStream.java gnu-xml-dom.lo: $(gnu_xml_dom_source_files) @find $(srcdir)/classpath/lib/gnu/xml/dom -name '*.class' > gnu-xml-dom.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-dom.lo @gnu-xml-dom.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-dom.lo @gnu-xml-dom.list @rm -f gnu-xml-dom.list gnu_xml_libxmlj_source_files = \ @@ -3677,7 +3677,7 @@ classpath/gnu/xml/libxmlj/util/XMLJ.java gnu-xml-libxmlj.lo: $(gnu_xml_libxmlj_source_files) @find $(srcdir)/classpath/lib/gnu/xml/libxmlj -name '*.class' > gnu-xml-libxmlj.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-libxmlj.lo @gnu-xml-libxmlj.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-libxmlj.lo @gnu-xml-libxmlj.list @rm -f gnu-xml-libxmlj.list gnu_xml_pipeline_source_files = \ @@ -3697,7 +3697,7 @@ classpath/gnu/xml/pipeline/XsltFilter.java gnu-xml-pipeline.lo: $(gnu_xml_pipeline_source_files) @find $(srcdir)/classpath/lib/gnu/xml/pipeline -name '*.class' > gnu-xml-pipeline.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-pipeline.lo @gnu-xml-pipeline.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-pipeline.lo @gnu-xml-pipeline.list @rm -f gnu-xml-pipeline.list gnu_xml_stream_source_files = \ @@ -3734,7 +3734,7 @@ classpath/gnu/xml/stream/XMLStreamWriterImpl.java gnu-xml-stream.lo: $(gnu_xml_stream_source_files) @find $(srcdir)/classpath/lib/gnu/xml/stream -name '*.class' > gnu-xml-stream.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-stream.lo @gnu-xml-stream.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-stream.lo @gnu-xml-stream.list @rm -f gnu-xml-stream.list gnu_xml_transform_source_files = \ @@ -3795,7 +3795,7 @@ classpath/gnu/xml/transform/XSLURIResolver.java gnu-xml-transform.lo: $(gnu_xml_transform_source_files) @find $(srcdir)/classpath/lib/gnu/xml/transform -name '*.class' > gnu-xml-transform.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-transform.lo @gnu-xml-transform.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-transform.lo @gnu-xml-transform.list @rm -f gnu-xml-transform.list gnu_xml_util_source_files = \ @@ -3809,7 +3809,7 @@ classpath/gnu/xml/util/XMLWriter.java gnu-xml-util.lo: $(gnu_xml_util_source_files) @find $(srcdir)/classpath/lib/gnu/xml/util -name '*.class' > gnu-xml-util.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-util.lo @gnu-xml-util.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-util.lo @gnu-xml-util.list @rm -f gnu-xml-util.list gnu_xml_validation_source_files = \ @@ -3926,7 +3926,7 @@ classpath/gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.java gnu-xml-validation.lo: $(gnu_xml_validation_source_files) @find $(srcdir)/classpath/lib/gnu/xml/validation -name '*.class' > gnu-xml-validation.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-validation.lo @gnu-xml-validation.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-validation.lo @gnu-xml-validation.list @rm -f gnu-xml-validation.list gnu_xml_xpath_source_files = \ @@ -3988,7 +3988,7 @@ classpath/gnu/xml/xpath/XPathTokenizer.java gnu-xml-xpath.lo: $(gnu_xml_xpath_source_files) @find $(srcdir)/classpath/lib/gnu/xml/xpath -name '*.class' > gnu-xml-xpath.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-xpath.lo @gnu-xml-xpath.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-xpath.lo @gnu-xml-xpath.list @rm -f gnu-xml-xpath.list java_applet_source_files = \ @@ -5969,7 +5969,7 @@ classpath/javax/imageio/stream/MemoryCacheImageOutputStream.java javax-imageio.lo: $(javax_imageio_source_files) @find $(srcdir)/classpath/lib/javax/imageio -name '*.class' > javax-imageio.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o javax-imageio.lo @javax-imageio.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o javax-imageio.lo @javax-imageio.list @rm -f javax-imageio.list javax_management_source_files = \ @@ -6469,7 +6469,7 @@ classpath/javax/rmi/ssl/SslRMIServerSocketFactory.java javax-rmi.lo: $(javax_rmi_source_files) @find $(srcdir)/classpath/lib/javax/rmi -name '*.class' > javax-rmi.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o javax-rmi.lo @javax-rmi.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o javax-rmi.lo @javax-rmi.list @rm -f javax-rmi.list javax_security_auth_source_files = \ @@ -7576,7 +7576,7 @@ classpath/javax/xml/xpath/XPathVariableResolver.java javax-xml.lo: $(javax_xml_source_files) @find $(srcdir)/classpath/lib/javax/xml -name '*.class' > javax-xml.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o javax-xml.lo @javax-xml.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o javax-xml.lo @javax-xml.list @rm -f javax-xml.list org_ietf_jgss_source_files = \ @@ -8135,7 +8135,7 @@ classpath/org/omg/stub/java/rmi/_Remote_Stub.java org-omg.lo: $(org_omg_source_files) @find $(srcdir)/classpath/lib/org/omg -name '*.class' > org-omg.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o org-omg.lo @org-omg.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o org-omg.lo @org-omg.list @rm -f org-omg.list org_relaxng_source_files = \ @@ -8152,7 +8152,7 @@ classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/StreamingValidat org-relaxng.lo: $(org_relaxng_source_files) @find $(srcdir)/classpath/lib/org/relaxng -name '*.class' > org-relaxng.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o org-relaxng.lo @org-relaxng.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o org-relaxng.lo @org-relaxng.list @rm -f org-relaxng.list org_w3c_source_files = \ @@ -8305,7 +8305,7 @@ classpath/external/w3c_dom/org/w3c/dom/xpath/XPathResult.java org-w3c.lo: $(org_w3c_source_files) @find $(srcdir)/classpath/lib/org/w3c -name '*.class' > org-w3c.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o org-w3c.lo @org-w3c.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o org-w3c.lo @org-w3c.list @rm -f org-w3c.list org_xml_source_files = \ @@ -8348,7 +8348,7 @@ classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java org-xml.lo: $(org_xml_source_files) @find $(srcdir)/classpath/lib/org/xml -name '*.class' > org-xml.list - $(LTGCJCOMPILE) -fjni -findirect-dispatch -fno-indirect-classes -c -o org-xml.lo @org-xml.list + $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o org-xml.lo @org-xml.list @rm -f org-xml.list sun_misc_source_files = \ -- 2.11.0