Skip to content

R
riscv-gcc-1
Commit ee4e9e65 by Tom Tromey Committed by Tom Tromey
Options

sources.am, [...]: Rebuilt. 

	* sources.am, Makefile.in: Rebuilt.
	* scripts/makemake.tcl: Accept -verbose command-line option.
	(is_verbose): New global.
	(verbose): Use it.
	(classify_source_file): Don't special case '.' for 'package'
	type.

From-SVN: r114051
parent 03e67131
Showing with 176 additions and 59 deletions
libjava/ChangeLog
2006-05-24 Tom Tromey <tromey@redhat.com>
* sources.am, Makefile.in: Rebuilt.
* scripts/makemake.tcl: Accept -verbose command-line option.
(is_verbose): New global.
(verbose): Use it.
(classify_source_file): Don't special case '.' for 'package'
type.
2006-05-24 Tom Tromey <tromey@redhat.com>
PR libgcj/27729:
* java/lang/reflect/natField.cc (getAddr): Added parens.
* java/lang/reflect/natConstructor.cc (getModifiersInternal):
......
libjava/scripts/makemake.tcl
......@@ -7,9 +7,15 @@ proc makearray {name} {
unset ary(_)
}
global is_verbose
set is_verbose 0
# Verbose printer.
proc verbose {text} {
# puts stderr $text
global is_verbose
if {$is_verbose} {
puts stderr $text
}
}
# This maps a name to its style:
......@@ -160,9 +166,9 @@ proc classify_source_file {basedir file} {
set pkg $file
while {1} {
if {[info exists package_map($pkg)]} {
# If the entry for '.' is 'package', then set up a new entry for
# the file's package.
if {$pkg == "." && $package_map($pkg) == "package"} {
# If the entry is 'package', then set up a new entry for the
# file's package.
if {$package_map($pkg) == "package"} {
set pkg [file dirname $file]
set package_map($pkg) package
}
......@@ -353,6 +359,11 @@ proc pp_var {name valueList {pre ""} {post ""}} {
puts ""
}
global argv
if {[llength $argv] > 0 && [lindex $argv 0] == "-verbose"} {
set is_verbose 1
}
# Read the proper .omit files.
read_omit_file standard.omit.in
read_omit_file classpath/lib/standard.omit
......
libjava/sources.am
......@@ -1272,12 +1272,7 @@ classpath/gnu/java/net/HeaderFieldHelper.java \
classpath/gnu/java/net/LineInputStream.java \
gnu/java/net/PlainDatagramSocketImpl.java \
gnu/java/net/PlainSocketImpl.java \
classpath/gnu/java/net/URLParseError.java \
gnu/java/net/protocol/core/Connection.java \
gnu/java/net/protocol/core/CoreInputStream.java \
gnu/java/net/protocol/core/Handler.java \
gnu/java/net/protocol/gcjlib/Connection.java \
gnu/java/net/protocol/gcjlib/Handler.java
classpath/gnu/java/net/URLParseError.java
gnu_java_net_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_net_source_files)))
......@@ -1311,6 +1306,24 @@ gnu/java/net/local.list: $(gnu_java_net_local_source_files)
-include gnu/java/net/local.deps
gnu_java_net_protocol_core_source_files = \
gnu/java/net/protocol/core/Connection.java \
gnu/java/net/protocol/core/CoreInputStream.java \
gnu/java/net/protocol/core/Handler.java
gnu_java_net_protocol_core_header_files = $(patsubst %.java,%.h,$(gnu_java_net_protocol_core_source_files))
gnu/java/net/protocol/core.list: $(gnu_java_net_protocol_core_source_files)
@$(mkinstalldirs) $(dir $@)
@for file in $(gnu_java_net_protocol_core_source_files); do \
if test -f $(srcdir)/$$file; then \
echo $(srcdir)/$$file; \
else echo $$file; fi; \
done > gnu/java/net/protocol/core.list
-include gnu/java/net/protocol/core.deps
gnu_java_net_protocol_file_source_files = \
classpath/gnu/java/net/protocol/file/Connection.java \
classpath/gnu/java/net/protocol/file/Handler.java
......@@ -1359,6 +1372,23 @@ gnu/java/net/protocol/ftp.list: $(gnu_java_net_protocol_ftp_source_files)
-include gnu/java/net/protocol/ftp.deps
gnu_java_net_protocol_gcjlib_source_files = \
gnu/java/net/protocol/gcjlib/Connection.java \
gnu/java/net/protocol/gcjlib/Handler.java
gnu_java_net_protocol_gcjlib_header_files = $(patsubst %.java,%.h,$(gnu_java_net_protocol_gcjlib_source_files))
gnu/java/net/protocol/gcjlib.list: $(gnu_java_net_protocol_gcjlib_source_files)
@$(mkinstalldirs) $(dir $@)
@for file in $(gnu_java_net_protocol_gcjlib_source_files); do \
if test -f $(srcdir)/$$file; then \
echo $(srcdir)/$$file; \
else echo $$file; fi; \
done > gnu/java/net/protocol/gcjlib.list
-include gnu/java/net/protocol/gcjlib.deps
gnu_java_net_protocol_http_source_files = \
classpath/gnu/java/net/protocol/http/Authenticator.java \
classpath/gnu/java/net/protocol/http/ByteArrayRequestBodyWriter.java \
......@@ -1556,15 +1586,7 @@ gnu/java/nio/charset.list: $(gnu_java_nio_charset_source_files)
gnu_java_rmi_source_files = \
classpath/gnu/java/rmi/RMIMarshalledObjectInputStream.java \
classpath/gnu/java/rmi/RMIMarshalledObjectOutputStream.java \
gnu/java/rmi/rmic/Compile_gcj.java \
gnu/java/rmi/rmic/Compile_jikes.java \
gnu/java/rmi/rmic/Compile_kjc.java \
gnu/java/rmi/rmic/Compiler.java \
gnu/java/rmi/rmic/CompilerProcess.java \
gnu/java/rmi/rmic/RMIC.java \
gnu/java/rmi/rmic/RMICException.java \
gnu/java/rmi/rmic/TabbedWriter.java
classpath/gnu/java/rmi/RMIMarshalledObjectOutputStream.java
gnu_java_rmi_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_rmi_source_files)))
......@@ -1635,6 +1657,29 @@ gnu/java/rmi/registry.list: $(gnu_java_rmi_registry_source_files)
-include gnu/java/rmi/registry.deps
gnu_java_rmi_rmic_source_files = \
gnu/java/rmi/rmic/Compile_gcj.java \
gnu/java/rmi/rmic/Compile_jikes.java \
gnu/java/rmi/rmic/Compile_kjc.java \
gnu/java/rmi/rmic/Compiler.java \
gnu/java/rmi/rmic/CompilerProcess.java \
gnu/java/rmi/rmic/RMIC.java \
gnu/java/rmi/rmic/RMICException.java \
gnu/java/rmi/rmic/TabbedWriter.java
gnu_java_rmi_rmic_header_files = $(patsubst %.java,%.h,$(gnu_java_rmi_rmic_source_files))
gnu/java/rmi/rmic.list: $(gnu_java_rmi_rmic_source_files)
@$(mkinstalldirs) $(dir $@)
@for file in $(gnu_java_rmi_rmic_source_files); do \
if test -f $(srcdir)/$$file; then \
echo $(srcdir)/$$file; \
else echo $$file; fi; \
done > gnu/java/rmi/rmic.list
-include gnu/java/rmi/rmic.deps
gnu_java_rmi_server_source_files = \
classpath/gnu/java/rmi/server/ActivatableRef.java \
classpath/gnu/java/rmi/server/ActivatableServerRef.java \
......@@ -8330,8 +8375,10 @@ all_packages_source_files = \
gnu/java/math.list \
gnu/java/net.list \
gnu/java/net/local.list \
gnu/java/net/protocol/core.list \
gnu/java/net/protocol/file.list \
gnu/java/net/protocol/ftp.list \
gnu/java/net/protocol/gcjlib.list \
gnu/java/net/protocol/http.list \
gnu/java/net/protocol/https.list \
gnu/java/net/protocol/jar.list \
......@@ -8342,6 +8389,7 @@ all_packages_source_files = \
gnu/java/rmi/activation.list \
gnu/java/rmi/dgc.list \
gnu/java/rmi/registry.list \
gnu/java/rmi/rmic.list \
gnu/java/rmi/server.list \
gnu/java/security.list \
gnu/java/security/action.list \
......@@ -8544,8 +8592,10 @@ ordinary_header_files = \
$(gnu_java_math_header_files) \
$(gnu_java_net_header_files) \
$(gnu_java_net_local_header_files) \
$(gnu_java_net_protocol_core_header_files) \
$(gnu_java_net_protocol_file_header_files) \
$(gnu_java_net_protocol_ftp_header_files) \
$(gnu_java_net_protocol_gcjlib_header_files) \
$(gnu_java_net_protocol_http_header_files) \
$(gnu_java_net_protocol_https_header_files) \
$(gnu_java_net_protocol_jar_header_files) \
......@@ -8556,6 +8606,7 @@ ordinary_header_files = \
$(gnu_java_rmi_activation_header_files) \
$(gnu_java_rmi_dgc_header_files) \
$(gnu_java_rmi_registry_header_files) \
$(gnu_java_rmi_rmic_header_files) \
$(gnu_java_rmi_server_header_files) \
$(gnu_java_security_header_files) \
$(gnu_java_security_action_header_files) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment