procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Makefile.in: Rebuilt.

Browse source 
* Makefile.in: Rebuilt.
	* Makefile.am (AM_CXXFLAGS): Define TOOLEXECLIBDIR.
	(libgcj0_convenience_la_SOURCES): Don't include
	gnu_xml_source_files.
	(libgcj0_convenience_la_LIBADD): New variable.
	(libgcj_la_LIBADD): Don't include sax or w3c_dom.
	(all_java_source_files): javax_imageio_source_files,
	javax_xml_source_files, and gnu_java_beans_source_files.
	($(gnu_xml_source_files:.java=.lo)): Removed target.
	(gnu-xml.lo): New target.
	(javax-imageio.lo): Likewise.
	(javax-xml.lo): Likewise.
	(gnu-java-beans.lo): Likewise.
	(gnu_java_beans_source_files): New variable.
	(javax_imageio_source_files): Likewise.
	(javax_xml_source_files): Likewise.
	(javax_source_files): Moved files to other variable.
	(awt_java_source_files): Likewise.
	(ordinary_java_source_files): Added BootClassLoader.java.
	* java/lang/natVMClassLoader.cc (defineClass): Use boot loader,
	not system class loader.
	(initBootLoader): New method.
	(loadClass): Search bootLoader.
	* java/lang/natClassLoader.cc (_Jv_RegisterInitiatingLoader): Use
	boot loader, not system class loader.
	(_Jv_UnregisterInitiatingLoader): Likewise.
	(_Jv_FindClass): Likewise.  Ensure entries in
	bootstrap_class_list are unique.
	* java/lang/natClass.cc (getClassLoader): Don't special case
	system class loader.
	* java/lang/VMClassLoader.java (bootLoader): New field.
	(getResource): Use bootLoader.
	(getResources): Likewise.
	(initBootLoader): Declare.
	* gnu/gcj/runtime/BootClassLoader.java: New file.
	* external/sax/org/xml/sax/helpers/NamespaceSupport.java
	(EMPTY_ENUMERATION): Now package-private.
	* external/w3c_com/Makefile.in: Rebuilt.
	* external/w3c_com/Makefile.am (MULTIBUILDTOP): New variable.
	(w3c.jar): New target.
	(classes.stamp): Updated.
	(toolexeclib_LTLIBRARIES): Renamed from noinst_LTLIBRARIES.
	Changed name of library.
	(libw3c_gcj_la_SOURCES): New variable.
	(libw3c_gcj_la_GCJFLAGS): Likewise.
	(source_files): Renamed from lib3c_convenience_la_SOURCES.
	* external/sax/Makefile.in: Rebuilt.
	* external/sax/Makefile.am (MULTIBUILDTOP): New variable.
	(sax.jar): New target.
	(classes.stamp): Updated.
	(toolexeclib_LTLIBRARIES): Renamed from noinst_LTLIBRARIES.
	Changed name of library.
	(libsax_gcj_la_SOURCES): New variable.
	(libsax_gcj_la_GCJFLAGS): Likewise.
	(source_files): Renamed from libsax_convenience_la_SOURCES.
	* stacktrace.cc (non_system_trace_fn): Don't look at system class
	loader.
	* prims.cc (_Jv_CreateJavaVM): Initialize the bootstrap class
	loader.
	(_Jv_RunMain): Handle case where 'runtime' is NULL at exit.

From-SVN: r96960
This commit is contained in:
Tom Tromey 2005-03-24 00:04:22 +00:00 • committed by Tom Tromey
parent 85624ffd34
commit aa893047e8
24 changed files with 8517 additions and 10715 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
libjava/ChangeLog
View file

@ -1,3 +1,66 @@
2005-03-23 Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt.
* Makefile.am (AM_CXXFLAGS): Define TOOLEXECLIBDIR.
(libgcj0_convenience_la_SOURCES): Don't include
gnu_xml_source_files.
(libgcj0_convenience_la_LIBADD): New variable.
(libgcj_la_LIBADD): Don't include sax or w3c_dom.
(all_java_source_files): javax_imageio_source_files,
javax_xml_source_files, and gnu_java_beans_source_files.
($(gnu_xml_source_files:.java=.lo)): Removed target.
(gnu-xml.lo): New target.
(javax-imageio.lo): Likewise.
(javax-xml.lo): Likewise.
(gnu-java-beans.lo): Likewise.
(gnu_java_beans_source_files): New variable.
(javax_imageio_source_files): Likewise.
(javax_xml_source_files): Likewise.
(javax_source_files): Moved files to other variable.
(awt_java_source_files): Likewise.
(ordinary_java_source_files): Added BootClassLoader.java.
* java/lang/natVMClassLoader.cc (defineClass): Use boot loader,
not system class loader.
(initBootLoader): New method.
(loadClass): Search bootLoader.
* java/lang/natClassLoader.cc (_Jv_RegisterInitiatingLoader): Use
boot loader, not system class loader.
(_Jv_UnregisterInitiatingLoader): Likewise.
(_Jv_FindClass): Likewise. Ensure entries in
bootstrap_class_list are unique.
* java/lang/natClass.cc (getClassLoader): Don't special case
system class loader.
* java/lang/VMClassLoader.java (bootLoader): New field.
(getResource): Use bootLoader.
(getResources): Likewise.
(initBootLoader): Declare.
* gnu/gcj/runtime/BootClassLoader.java: New file.
* external/sax/org/xml/sax/helpers/NamespaceSupport.java
(EMPTY_ENUMERATION): Now package-private.
* external/w3c_com/Makefile.in: Rebuilt.
* external/w3c_com/Makefile.am (MULTIBUILDTOP): New variable.
(w3c.jar): New target.
(classes.stamp): Updated.
(toolexeclib_LTLIBRARIES): Renamed from noinst_LTLIBRARIES.
Changed name of library.
(libw3c_gcj_la_SOURCES): New variable.
(libw3c_gcj_la_GCJFLAGS): Likewise.
(source_files): Renamed from lib3c_convenience_la_SOURCES.
* external/sax/Makefile.in: Rebuilt.
* external/sax/Makefile.am (MULTIBUILDTOP): New variable.
(sax.jar): New target.
(classes.stamp): Updated.
(toolexeclib_LTLIBRARIES): Renamed from noinst_LTLIBRARIES.
Changed name of library.
(libsax_gcj_la_SOURCES): New variable.
(libsax_gcj_la_GCJFLAGS): Likewise.
(source_files): Renamed from libsax_convenience_la_SOURCES.
* stacktrace.cc (non_system_trace_fn): Don't look at system class
loader.
* prims.cc (_Jv_CreateJavaVM): Initialize the bootstrap class
loader.
(_Jv_RunMain): Handle case where 'runtime' is NULL at exit.
2005-03-23 Sven de Marothy <sven@physto.se>
PR libgcj/2641, PR libgcj/9854, PR libgcj/14892, PR libgcj/18083,

255
libjava/Makefile.am
View file

@ -184,7 +184,8 @@ AM_CXXFLAGS = \
-DLIBDIR="\"$(libdir)\"" \
-DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" \
-DJAVA_EXT_DIRS="\"$(jardir)/ext\"" \
-DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\""
-DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
-DTOOLEXECLIBDIR="\"$(toolexeclibdir)\""
AM_GCJFLAGS = \
@LIBGCJ_JAVAFLAGS@ \
@ -233,12 +234,16 @@ libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
libgcj0_convenience_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc \
link.cc defineclass.cc interpret.cc verify.cc \
$(nat_source_files) $(math_c_source_files) $(java_source_files) \
$(gnu_xml_source_files) $(built_java_source_files) \
$(built_java_source_files) \
$(BOEHMGC_SRC) $(NOGC_SRC) \
$(BACKTRACE_SRC) \
$(POSIX_PLATFORM_SRC) $(WIN32_PLATFORM_SRC) $(ECOS_PLATFORM_SRC) \
$(DARWIN_CRT_SRC) \
$(POSIX_THREAD_SRC) $(WIN32_THREAD_SRC) $(NO_THREAD_SRC)
libgcj0_convenience_la_LIBADD = \
gnu-xml.lo javax-imageio.lo \
javax-xml.lo gnu-java-beans.lo
noinst_LTLIBRARIES = libgcj0_convenience.la
libgcj_la_SOURCES =
@ -254,8 +259,6 @@ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \
$(LIBLTDL) $(SYS_ZLIBS) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
libgcj_la_LIBADD = \
external/sax/libsax_convenience.la \
external/w3c_dom/libw3c_convenience.la \
libgcj0_convenience.la \
$(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files)
libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar \
@ -515,7 +518,10 @@ all_java_source_files = \
$(built_java_source_files) \
$(gtk_awt_peer_sources) \
$(xlib_java_source_files) \
$(gnu_xml_source_files)
$(gnu_xml_source_files) \
$(javax_imageio_source_files) \
$(javax_xml_source_files) \
$(gnu_java_beans_source_files)
all_java_class_files = $(all_java_source_files:.java=.class)
@ -610,7 +616,7 @@ SUFFIXES = .class .java .h .properties
$(javao_files) $(xlib_javao_files): %.lo: %.java
$(LTGCJCOMPILE) -o $@ -c $<
$(gtk_awt_peer_sources:.java=.lo) $(gnu_xml_source_files:.java=.lo): %.lo: %.java
$(gtk_awt_peer_sources:.java=.lo): %.lo: %.java
$(LTGCJCOMPILE) -fjni -o $@ -c $<
## Pass the list of object files to libtool in a temporary file to
@ -630,6 +636,58 @@ lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPEND
## ################################################################
##
## Some packages must be built with the binary compatibility ABI. We
## compile each such package into a .so, broken down more or less by
## conceptual unit.
##
## Depend on the sources, even though we are going to compile the
## classes.
gnu-xml.lo: $(gnu_xml_source_files)
## FIXME: this is ugly. We want to make sure the .class files have
## been built, but we don't want a real dependency on them as this
## would cause our target to be rebuilt whenever any .java file is
## touched.
$(MAKE) classes.stamp
$(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o gnu-xml.lo \
`find gnu/xml -name '*.class' -print`
## Depend on the sources, even though we are going to compile the
## classes.
javax-imageio.lo: $(javax_imageio_source_files)
## FIXME: this is ugly. We want to make sure the .class files have
## been built, but we don't want a real dependency on them as this
## would cause our target to be rebuilt whenever any .java file is
## touched.
$(MAKE) classes.stamp
$(LTGCJCOMPILE) -findirect-dispatch -c -o javax-imageio.lo \
`find javax/imageio -name '*.class' -print`
## Depend on the sources, even though we are going to compile the
## classes.
javax-xml.lo: $(javax_xml_source_files)
## FIXME: this is ugly. We want to make sure the .class files have
## been built, but we don't want a real dependency on them as this
## would cause our target to be rebuilt whenever any .java file is
## touched.
$(MAKE) classes.stamp
$(LTGCJCOMPILE) -findirect-dispatch -c -o javax-xml.lo \
`find javax/xml -name '*.class' -print`
## Depend on the sources, even though we are going to compile the
## classes.
gnu-java-beans.lo: $(gnu_java_beans_source_files)
## FIXME: this is ugly. We want to make sure the .class files have
## been built, but we don't want a real dependency on them as this
## would cause our target to be rebuilt whenever any .java file is
## touched.
$(MAKE) classes.stamp
$(LTGCJCOMPILE) -findirect-dispatch -c -o gnu-java-beans.lo \
`find gnu/java/beans -name '*.class' -print`
## ################################################################
##
## How to build header files.
##
@ -1054,40 +1112,7 @@ gnu/gcj/convert/UnicodeToBytes.java
## hand.
special_java_source_files = java/lang/Class.java java/lang/Object.java
awt_java_source_files = \
gnu/awt/LightweightRedirector.java \
gnu/awt/j2d/AbstractGraphicsState.java \
gnu/awt/j2d/DirectRasterGraphics.java \
gnu/awt/j2d/Graphics2DImpl.java \
gnu/awt/j2d/IntegerGraphicsState.java \
gnu/awt/j2d/MappedRaster.java \
gnu/java/awt/BitMaskExtent.java \
gnu/java/awt/Buffers.java \
gnu/java/awt/BitwiseXORComposite.java \
gnu/java/awt/ComponentDataBlitOp.java \
gnu/java/awt/ClasspathToolkit.java \
gnu/java/awt/EmbeddedWindow.java \
gnu/java/awt/EmbeddedWindowSupport.java \
gnu/java/awt/EventModifier.java \
gnu/java/awt/color/CieXyzConverter.java \
gnu/java/awt/color/ClutProfileConverter.java \
gnu/java/awt/color/ColorLookUpTable.java \
gnu/java/awt/color/ColorSpaceConverter.java \
gnu/java/awt/color/GrayProfileConverter.java \
gnu/java/awt/color/GrayScaleConverter.java \
gnu/java/awt/color/LinearRGBConverter.java \
gnu/java/awt/color/ProfileHeader.java \
gnu/java/awt/color/PyccConverter.java \
gnu/java/awt/color/RgbProfileConverter.java \
gnu/java/awt/color/SrgbConverter.java \
gnu/java/awt/color/TagEntry.java \
gnu/java/awt/color/ToneReproductionCurve.java \
gnu/java/awt/image/ImageDecoder.java \
gnu/java/awt/image/XBMDecoder.java \
gnu/java/awt/peer/EmbeddedWindowPeer.java \
gnu/java/awt/peer/GLightweightPeer.java \
gnu/java/awt/peer/ClasspathFontPeer.java \
gnu/java/awt/peer/ClasspathTextLayoutPeer.java \
gnu_java_beans_source_files = \
gnu/java/beans/decoder/AbstractContext.java \
gnu/java/beans/decoder/AbstractCreatableObjectContext.java \
gnu/java/beans/decoder/AbstractElementHandler.java \
@ -1139,7 +1164,42 @@ gnu/java/beans/BeanInfoEmbryo.java \
gnu/java/beans/DummyAppletContext.java \
gnu/java/beans/DummyAppletStub.java \
gnu/java/beans/ExplicitBeanInfo.java \
gnu/java/beans/IntrospectionIncubator.java \
gnu/java/beans/IntrospectionIncubator.java
awt_java_source_files = \
gnu/awt/LightweightRedirector.java \
gnu/awt/j2d/AbstractGraphicsState.java \
gnu/awt/j2d/DirectRasterGraphics.java \
gnu/awt/j2d/Graphics2DImpl.java \
gnu/awt/j2d/IntegerGraphicsState.java \
gnu/awt/j2d/MappedRaster.java \
gnu/java/awt/BitMaskExtent.java \
gnu/java/awt/Buffers.java \
gnu/java/awt/BitwiseXORComposite.java \
gnu/java/awt/ComponentDataBlitOp.java \
gnu/java/awt/ClasspathToolkit.java \
gnu/java/awt/EmbeddedWindow.java \
gnu/java/awt/EmbeddedWindowSupport.java \
gnu/java/awt/EventModifier.java \
gnu/java/awt/color/CieXyzConverter.java \
gnu/java/awt/color/ClutProfileConverter.java \
gnu/java/awt/color/ColorLookUpTable.java \
gnu/java/awt/color/ColorSpaceConverter.java \
gnu/java/awt/color/GrayProfileConverter.java \
gnu/java/awt/color/GrayScaleConverter.java \
gnu/java/awt/color/LinearRGBConverter.java \
gnu/java/awt/color/ProfileHeader.java \
gnu/java/awt/color/PyccConverter.java \
gnu/java/awt/color/RgbProfileConverter.java \
gnu/java/awt/color/SrgbConverter.java \
gnu/java/awt/color/TagEntry.java \
gnu/java/awt/color/ToneReproductionCurve.java \
gnu/java/awt/image/ImageDecoder.java \
gnu/java/awt/image/XBMDecoder.java \
gnu/java/awt/peer/EmbeddedWindowPeer.java \
gnu/java/awt/peer/GLightweightPeer.java \
gnu/java/awt/peer/ClasspathFontPeer.java \
gnu/java/awt/peer/ClasspathTextLayoutPeer.java \
java/applet/Applet.java \
java/applet/AppletStub.java \
java/applet/AppletContext.java \
@ -1982,7 +2042,7 @@ gnu/java/rmi/server/UnicastRemoteStub.java \
gnu/java/rmi/server/UnicastServer.java \
gnu/java/rmi/server/UnicastServerRef.java
javax_source_files = \
javax_imageio_source_files = \
javax/imageio/ImageWriteParam.java \
javax/imageio/ImageReader.java \
javax/imageio/ImageWriter.java \
@ -2028,7 +2088,63 @@ javax/imageio/event/IIOWriteProgressListener.java \
javax/imageio/ImageTranscoder.java \
javax/imageio/ImageTypeSpecifier.java \
javax/imageio/ImageIO.java \
javax/imageio/IIOImage.java \
javax/imageio/IIOImage.java
javax_xml_source_files = \
javax/xml/xpath/XPathConstants.java \
javax/xml/xpath/XPathFunction.java \
javax/xml/xpath/XPathVariableResolver.java \
javax/xml/xpath/XPathExpressionException.java \
javax/xml/xpath/XPathFunctionResolver.java \
javax/xml/xpath/XPath.java \
javax/xml/xpath/XPathFactoryConfigurationException.java \
javax/xml/xpath/XPathFactory.java \
javax/xml/xpath/XPathException.java \
javax/xml/xpath/XPathExpression.java \
javax/xml/xpath/XPathFunctionException.java \
javax/xml/validation/ValidatorHandler.java \
javax/xml/validation/Validator.java \
javax/xml/validation/TypeInfoProvider.java \
javax/xml/validation/SchemaFactory.java \
javax/xml/validation/Schema.java \
javax/xml/parsers/SAXParserFactory.java \
javax/xml/parsers/FactoryConfigurationError.java \
javax/xml/parsers/SAXParser.java \
javax/xml/parsers/DocumentBuilderFactory.java \
javax/xml/parsers/ParserConfigurationException.java \
javax/xml/parsers/DocumentBuilder.java \
javax/xml/datatype/DatatypeFactory.java \
javax/xml/datatype/XMLGregorianCalendar.java \
javax/xml/datatype/Duration.java \
javax/xml/datatype/DatatypeConfigurationException.java \
javax/xml/datatype/DatatypeConstants.java \
javax/xml/XMLConstants.java \
javax/xml/namespace/NamespaceContext.java \
javax/xml/namespace/QName.java \
javax/xml/transform/TransformerException.java \
javax/xml/transform/TransformerFactoryConfigurationError.java \
javax/xml/transform/sax/SAXResult.java \
javax/xml/transform/sax/TransformerHandler.java \
javax/xml/transform/sax/SAXTransformerFactory.java \
javax/xml/transform/sax/SAXSource.java \
javax/xml/transform/sax/TemplatesHandler.java \
javax/xml/transform/OutputKeys.java \
javax/xml/transform/stream/StreamResult.java \
javax/xml/transform/stream/StreamSource.java \
javax/xml/transform/Source.java \
javax/xml/transform/SourceLocator.java \
javax/xml/transform/ErrorListener.java \
javax/xml/transform/TransformerConfigurationException.java \
javax/xml/transform/Templates.java \
javax/xml/transform/Result.java \
javax/xml/transform/URIResolver.java \
javax/xml/transform/dom/DOMSource.java \
javax/xml/transform/dom/DOMLocator.java \
javax/xml/transform/dom/DOMResult.java \
javax/xml/transform/Transformer.java \
javax/xml/transform/TransformerFactory.java
javax_source_files = \
javax/net/VanillaSocketFactory.java \
javax/net/ssl/TrustManagerFactorySpi.java \
javax/net/ssl/SSLKeyException.java \
@ -2267,58 +2383,6 @@ javax/naming/NameClassPair.java \
javax/naming/RefAddr.java \
javax/naming/CompositeName.java \
javax/naming/Name.java \
javax/xml/xpath/XPathConstants.java \
javax/xml/xpath/XPathFunction.java \
javax/xml/xpath/XPathVariableResolver.java \
javax/xml/xpath/XPathExpressionException.java \
javax/xml/xpath/XPathFunctionResolver.java \
javax/xml/xpath/XPath.java \
javax/xml/xpath/XPathFactoryConfigurationException.java \
javax/xml/xpath/XPathFactory.java \
javax/xml/xpath/XPathException.java \
javax/xml/xpath/XPathExpression.java \
javax/xml/xpath/XPathFunctionException.java \
javax/xml/validation/ValidatorHandler.java \
javax/xml/validation/Validator.java \
javax/xml/validation/TypeInfoProvider.java \
javax/xml/validation/SchemaFactory.java \
javax/xml/validation/Schema.java \
javax/xml/parsers/SAXParserFactory.java \
javax/xml/parsers/FactoryConfigurationError.java \
javax/xml/parsers/SAXParser.java \
javax/xml/parsers/DocumentBuilderFactory.java \
javax/xml/parsers/ParserConfigurationException.java \
javax/xml/parsers/DocumentBuilder.java \
javax/xml/datatype/DatatypeFactory.java \
javax/xml/datatype/XMLGregorianCalendar.java \
javax/xml/datatype/Duration.java \
javax/xml/datatype/DatatypeConfigurationException.java \
javax/xml/datatype/DatatypeConstants.java \
javax/xml/XMLConstants.java \
javax/xml/namespace/NamespaceContext.java \
javax/xml/namespace/QName.java \
javax/xml/transform/TransformerException.java \
javax/xml/transform/TransformerFactoryConfigurationError.java \
javax/xml/transform/sax/SAXResult.java \
javax/xml/transform/sax/TransformerHandler.java \
javax/xml/transform/sax/SAXTransformerFactory.java \
javax/xml/transform/sax/SAXSource.java \
javax/xml/transform/sax/TemplatesHandler.java \
javax/xml/transform/OutputKeys.java \
javax/xml/transform/stream/StreamResult.java \
javax/xml/transform/stream/StreamSource.java \
javax/xml/transform/Source.java \
javax/xml/transform/SourceLocator.java \
javax/xml/transform/ErrorListener.java \
javax/xml/transform/TransformerConfigurationException.java \
javax/xml/transform/Templates.java \
javax/xml/transform/Result.java \
javax/xml/transform/URIResolver.java \
javax/xml/transform/dom/DOMSource.java \
javax/xml/transform/dom/DOMLocator.java \
javax/xml/transform/dom/DOMResult.java \
javax/xml/transform/Transformer.java \
javax/xml/transform/TransformerFactory.java \
javax/security/cert/CertificateNotYetValidException.java \
javax/security/cert/Certificate.java \
javax/security/cert/X509Certificate.java \
@ -2919,6 +2983,7 @@ gnu/gcj/RawDataManaged.java \
gnu/gcj/io/DefaultMimeTypes.java \
gnu/gcj/io/MimeTypes.java \
gnu/gcj/io/SimpleSHSStream.java \
gnu/gcj/runtime/BootClassLoader.java \
gnu/gcj/runtime/FileDeleter.java \
gnu/gcj/runtime/FinalizerThread.java \
gnu/gcj/runtime/JNIWeakRef.java \

2871
libjava/Makefile.in
View file

File diff suppressed because it is too large Load diff

464
libjava/aclocal.m4 vendored
View file

@ -1,7 +1,7 @@
# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
# generated automatically by aclocal 1.9.3 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005 Free Software Foundation, Inc.
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -11,11 +11,23 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# -*- Autoconf -*-
# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
# Generated from amversion.in; do not edit by hand.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
@ -28,15 +40,26 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.9.5])])
[AM_AUTOMAKE_VERSION([1.9.3])])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
# AM_AUX_DIR_EXPAND
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
@ -83,16 +106,26 @@ AC_PREREQ([2.50])dnl
am_aux_dir=`cd $ac_aux_dir && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
# AM_CONDITIONAL -*- Autoconf -*-
# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
# serial 7
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 6
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@ -116,15 +149,26 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
# serial 7 -*- Autoconf -*-
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 8
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@ -133,6 +177,7 @@ fi])])
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
@ -272,16 +317,27 @@ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
# Generate code to set up dependency tracking. -*- Autoconf -*-
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
#serial 3
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
#serial 2
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
@ -340,14 +396,25 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
# Check for Java compiler. -*- Autoconf -*-
# Check for Java compiler.
# For now we only handle the GNU compiler.
# Copyright (C) 1999, 2000, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
AC_DEFUN([AM_PROG_GCJ],[
AC_CHECK_PROGS(GCJ, gcj, gcj)
@ -359,20 +426,31 @@ AC_SUBST(GCJFLAGS)
_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(GCJ)])
])
# Do all the work for Automake. -*- Autoconf -*-
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 12
# This macro actually does too much. Some checks are only needed if
# This macro actually does too much some checks are only needed if
# your package does certain things. But this isn't really a big deal.
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 11
# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
# AM_INIT_AUTOMAKE([OPTIONS])
# -----------------------------------------------
@ -473,27 +551,51 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
install_sh=${install_sh-"$am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# -*- Autoconf -*-
# Copyright (C) 2003 Free Software Foundation, Inc.
# serial 2
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 1
# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
@ -508,17 +610,28 @@ fi
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# Add --enable-maintainer-mode option to configure.
# From Jim Meyering
# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 4
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 3
AC_DEFUN([AM_MAINTAINER_MODE],
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
@ -537,15 +650,26 @@ AC_DEFUN([AM_MAINTAINER_MODE],
AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
# serial 3
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 2
# AM_MAKE_INCLUDE()
# -----------------
@ -589,17 +713,29 @@ AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
# Copyright (C) 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 3
# serial 2
# AM_PROG_CC_C_O
# --------------
# Like AC_PROG_CC_C_O, but changed for automake.
# Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
AC_DEFUN([AM_PROG_CC_C_O],
[AC_REQUIRE([AC_PROG_CC_C_O])dnl
AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
@ -617,16 +753,27 @@ if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
fi
])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# -*- Autoconf -*-
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 4
# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 3
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@ -652,16 +799,27 @@ else
fi
])
# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# AM_PROG_MKDIR_P
# ---------------
# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
#
# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
# created by `make install' are always world readable, even if the
# installer happens to have an overly restrictive umask (e.g. 077).
@ -715,15 +873,26 @@ else
fi
AC_SUBST([mkdir_p])])
# Helper functions for option handling. -*- Autoconf -*-
# Helper functions for option handling. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
# serial 3
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 2
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@ -748,16 +917,28 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
# Check to make sure that the build environment is sane. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# Check to make sure that the build environment is sane.
#
# serial 4
# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 3
# AM_SANITY_CHECK
# ---------------
@ -800,14 +981,25 @@ Check your system clock])
fi
AC_MSG_RESULT(yes)])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# AM_PROG_INSTALL_STRIP
# ---------------------
# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# One issue with vendor `install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip
@ -830,13 +1022,25 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# Copyright (C) 2004 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 1
# serial 2
# _AM_PROG_TAR(FORMAT)
# --------------------

24
libjava/external/Makefile.in vendored
View file

@ -1,8 +1,8 @@
# Makefile.in generated by automake 1.9.5 from Makefile.am.
# Makefile.in generated by automake 1.9.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# 2003, 2004 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -382,13 +382,7 @@ uninstall-info-am:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
*k*) failcom='fail=yes';; \
esac; \
done; \
@set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@ -400,7 +394,7 @@ $(RECURSIVE_TARGETS):
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@ -408,13 +402,7 @@ $(RECURSIVE_TARGETS):
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
*k*) failcom='fail=yes';; \
esac; \
done; \
@set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@ -435,7 +423,7 @@ maintainer-clean-recursive:
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \

19
libjava/external/sax/Makefile.am vendored
View file

@ -5,6 +5,9 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
## Needed because $(ZIP) is a relative path.
MULTIBUILDTOP = ../../
## The compiler with whatever flags we want for both -c and -C
## compiles.
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
@ -20,18 +23,24 @@ AM_GCJFLAGS = \
BUILT_SOURCES = classes.stamp
classes.stamp: $(libsax_convenience_la_SOURCES)
sax.jar: classes.stamp
find org -name '*.class' -print | $(ZIP) -cfME@ $@
classes.stamp: $(source_files)
here=`pwd`; cd $(srcdir); \
$(GCJ_WITH_FLAGS) -C -d $$here $(libsax_convenience_la_SOURCES)
$(GCJ_WITH_FLAGS) -C -d $$here $(source_files)
echo > classes.stamp
mostlyclean-local:
-find . -name '*.class' | xargs rm
-rm classes.stamp
-rm classes.stamp sax.jar
noinst_LTLIBRARIES = libsax_convenience.la
toolexeclib_LTLIBRARIES = libsax-gcj.la
libsax_convenience_la_SOURCES = \
libsax_gcj_la_SOURCES = sax.jar
libsax_gcj_la_GCJFLAGS = -findirect-dispatch
source_files = \
org/xml/sax/SAXNotSupportedException.java \
org/xml/sax/helpers/NamespaceSupport.java \
org/xml/sax/helpers/AttributesImpl.java \

358
libjava/external/sax/Makefile.in vendored
View file

@ -1,8 +1,8 @@
# Makefile.in generated by automake 1.9.5 from Makefile.am.
# Makefile.in generated by automake 1.9.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# 2003, 2004 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -14,7 +14,7 @@
@SET_MAKE@
SOURCES = $(libsax_convenience_la_SOURCES)
SOURCES = $(libsax_gcj_la_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@ -58,38 +58,18 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
CONFIG_HEADER = $(top_builddir)/include/config.h \
$(top_builddir)/gcj/libgcj-config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libsax_convenience_la_LIBADD =
am__dirstamp = $(am__leading_dot)dirstamp
am_libsax_convenience_la_OBJECTS = \
org/xml/sax/SAXNotSupportedException.lo \
org/xml/sax/helpers/NamespaceSupport.lo \
org/xml/sax/helpers/AttributesImpl.lo \
org/xml/sax/helpers/LocatorImpl.lo \
org/xml/sax/helpers/DefaultHandler.lo \
org/xml/sax/helpers/AttributeListImpl.lo \
org/xml/sax/helpers/ParserFactory.lo \
org/xml/sax/helpers/NewInstance.lo \
org/xml/sax/helpers/XMLFilterImpl.lo \
org/xml/sax/helpers/ParserAdapter.lo \
org/xml/sax/helpers/XMLReaderAdapter.lo \
org/xml/sax/helpers/XMLReaderFactory.lo \
org/xml/sax/HandlerBase.lo org/xml/sax/SAXException.lo \
org/xml/sax/ContentHandler.lo \
org/xml/sax/SAXNotRecognizedException.lo \
org/xml/sax/ErrorHandler.lo org/xml/sax/AttributeList.lo \
org/xml/sax/Locator.lo org/xml/sax/Attributes.lo \
org/xml/sax/SAXParseException.lo org/xml/sax/XMLFilter.lo \
org/xml/sax/EntityResolver.lo org/xml/sax/XMLReader.lo \
org/xml/sax/ext/Locator2.lo org/xml/sax/ext/LexicalHandler.lo \
org/xml/sax/ext/Attributes2Impl.lo \
org/xml/sax/ext/DeclHandler.lo org/xml/sax/ext/Attributes2.lo \
org/xml/sax/ext/EntityResolver2.lo \
org/xml/sax/ext/Locator2Impl.lo \
org/xml/sax/ext/DefaultHandler2.lo org/xml/sax/InputSource.lo \
org/xml/sax/DocumentHandler.lo org/xml/sax/DTDHandler.lo \
org/xml/sax/Parser.lo
libsax_convenience_la_OBJECTS = $(am_libsax_convenience_la_OBJECTS)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(toolexeclibdir)"
toolexeclibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
libsax_gcj_la_LIBADD =
am_libsax_gcj_la_OBJECTS = libsax_gcj_la-sax.lo
libsax_gcj_la_OBJECTS = $(am_libsax_gcj_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/gcj
depcomp = $(SHELL) $(top_srcdir)/../depcomp
am__depfiles_maybe = depfiles
@ -99,8 +79,8 @@ LTGCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ) $(AM_GCJFLAGS) \
GCJLD = $(GCJ)
GCJLINK = $(LIBTOOL) --mode=link $(GCJLD) $(AM_GCJFLAGS) $(GCJFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libsax_convenience_la_SOURCES)
DIST_SOURCES = $(libsax_convenience_la_SOURCES)
SOURCES = $(libsax_gcj_la_SOURCES)
DIST_SOURCES = $(libsax_gcj_la_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@ -327,6 +307,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
MULTIBUILDTOP = ../../
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(top_srcdir)'$(CLASSPATH_SEPARATOR)'$(top_builddir)
AM_GCJFLAGS = \
@ -337,8 +318,10 @@ AM_GCJFLAGS = \
-Wno-deprecated
BUILT_SOURCES = classes.stamp
noinst_LTLIBRARIES = libsax_convenience.la
libsax_convenience_la_SOURCES = \
toolexeclib_LTLIBRARIES = libsax-gcj.la
libsax_gcj_la_SOURCES = sax.jar
libsax_gcj_la_GCJFLAGS = -findirect-dispatch
source_files = \
org/xml/sax/SAXNotSupportedException.java \
org/xml/sax/helpers/NamespaceSupport.java \
org/xml/sax/helpers/AttributesImpl.java \
@ -380,7 +363,7 @@ all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
.SUFFIXES: .java .lo .o .obj
.SUFFIXES: .jar .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@ -410,235 +393,45 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(toolexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(toolexeclibdir)"
@list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
echo " $(LIBTOOL) --mode=install $(toolexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(toolexeclibdir)/$$f'"; \
$(LIBTOOL) --mode=install $(toolexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(toolexeclibdir)/$$f"; \
else :; fi; \
done
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
uninstall-toolexeclibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
@set -x; list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(toolexeclibdir)/$$p'"; \
$(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(toolexeclibdir)/$$p"; \
done
clean-toolexeclibLTLIBRARIES:
-test -z "$(toolexeclib_LTLIBRARIES)" || rm -f $(toolexeclib_LTLIBRARIES)
@list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
org/xml/sax/$(am__dirstamp):
@$(mkdir_p) org/xml/sax
@: > org/xml/sax/$(am__dirstamp)
org/xml/sax/$(DEPDIR)/$(am__dirstamp):
@$(mkdir_p) org/xml/sax/$(DEPDIR)
@: > org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/SAXNotSupportedException.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/$(am__dirstamp):
@$(mkdir_p) org/xml/sax/helpers
@: > org/xml/sax/helpers/$(am__dirstamp)
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp):
@$(mkdir_p) org/xml/sax/helpers/$(DEPDIR)
@: > org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/NamespaceSupport.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/AttributesImpl.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/LocatorImpl.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/DefaultHandler.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/AttributeListImpl.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/ParserFactory.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/NewInstance.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/XMLFilterImpl.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/ParserAdapter.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/XMLReaderAdapter.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/helpers/XMLReaderFactory.lo: \
org/xml/sax/helpers/$(am__dirstamp) \
org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/HandlerBase.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/SAXException.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ContentHandler.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/SAXNotRecognizedException.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ErrorHandler.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/AttributeList.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/Locator.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/Attributes.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/SAXParseException.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/XMLFilter.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/EntityResolver.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/XMLReader.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ext/$(am__dirstamp):
@$(mkdir_p) org/xml/sax/ext
@: > org/xml/sax/ext/$(am__dirstamp)
org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp):
@$(mkdir_p) org/xml/sax/ext/$(DEPDIR)
@: > org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ext/Locator2.lo: org/xml/sax/ext/$(am__dirstamp) \
org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ext/LexicalHandler.lo: org/xml/sax/ext/$(am__dirstamp) \
org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ext/Attributes2Impl.lo: org/xml/sax/ext/$(am__dirstamp) \
org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ext/DeclHandler.lo: org/xml/sax/ext/$(am__dirstamp) \
org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ext/Attributes2.lo: org/xml/sax/ext/$(am__dirstamp) \
org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ext/EntityResolver2.lo: org/xml/sax/ext/$(am__dirstamp) \
org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ext/Locator2Impl.lo: org/xml/sax/ext/$(am__dirstamp) \
org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/ext/DefaultHandler2.lo: org/xml/sax/ext/$(am__dirstamp) \
org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/InputSource.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/DocumentHandler.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/DTDHandler.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
org/xml/sax/Parser.lo: org/xml/sax/$(am__dirstamp) \
org/xml/sax/$(DEPDIR)/$(am__dirstamp)
libsax_convenience.la: $(libsax_convenience_la_OBJECTS) $(libsax_convenience_la_DEPENDENCIES)
$(GCJLINK) $(libsax_convenience_la_LDFLAGS) $(libsax_convenience_la_OBJECTS) $(libsax_convenience_la_LIBADD) $(LIBS)
libsax-gcj.la: $(libsax_gcj_la_OBJECTS) $(libsax_gcj_la_DEPENDENCIES)
$(GCJLINK) -rpath $(toolexeclibdir) $(libsax_gcj_la_LDFLAGS) $(libsax_gcj_la_OBJECTS) $(libsax_gcj_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-rm -f org/xml/sax/AttributeList.$(OBJEXT)
-rm -f org/xml/sax/AttributeList.lo
-rm -f org/xml/sax/Attributes.$(OBJEXT)
-rm -f org/xml/sax/Attributes.lo
-rm -f org/xml/sax/ContentHandler.$(OBJEXT)
-rm -f org/xml/sax/ContentHandler.lo
-rm -f org/xml/sax/DTDHandler.$(OBJEXT)
-rm -f org/xml/sax/DTDHandler.lo
-rm -f org/xml/sax/DocumentHandler.$(OBJEXT)
-rm -f org/xml/sax/DocumentHandler.lo
-rm -f org/xml/sax/EntityResolver.$(OBJEXT)
-rm -f org/xml/sax/EntityResolver.lo
-rm -f org/xml/sax/ErrorHandler.$(OBJEXT)
-rm -f org/xml/sax/ErrorHandler.lo
-rm -f org/xml/sax/HandlerBase.$(OBJEXT)
-rm -f org/xml/sax/HandlerBase.lo
-rm -f org/xml/sax/InputSource.$(OBJEXT)
-rm -f org/xml/sax/InputSource.lo
-rm -f org/xml/sax/Locator.$(OBJEXT)
-rm -f org/xml/sax/Locator.lo
-rm -f org/xml/sax/Parser.$(OBJEXT)
-rm -f org/xml/sax/Parser.lo
-rm -f org/xml/sax/SAXException.$(OBJEXT)
-rm -f org/xml/sax/SAXException.lo
-rm -f org/xml/sax/SAXNotRecognizedException.$(OBJEXT)
-rm -f org/xml/sax/SAXNotRecognizedException.lo
-rm -f org/xml/sax/SAXNotSupportedException.$(OBJEXT)
-rm -f org/xml/sax/SAXNotSupportedException.lo
-rm -f org/xml/sax/SAXParseException.$(OBJEXT)
-rm -f org/xml/sax/SAXParseException.lo
-rm -f org/xml/sax/XMLFilter.$(OBJEXT)
-rm -f org/xml/sax/XMLFilter.lo
-rm -f org/xml/sax/XMLReader.$(OBJEXT)
-rm -f org/xml/sax/XMLReader.lo
-rm -f org/xml/sax/ext/Attributes2.$(OBJEXT)
-rm -f org/xml/sax/ext/Attributes2.lo
-rm -f org/xml/sax/ext/Attributes2Impl.$(OBJEXT)
-rm -f org/xml/sax/ext/Attributes2Impl.lo
-rm -f org/xml/sax/ext/DeclHandler.$(OBJEXT)
-rm -f org/xml/sax/ext/DeclHandler.lo
-rm -f org/xml/sax/ext/DefaultHandler2.$(OBJEXT)
-rm -f org/xml/sax/ext/DefaultHandler2.lo
-rm -f org/xml/sax/ext/EntityResolver2.$(OBJEXT)
-rm -f org/xml/sax/ext/EntityResolver2.lo
-rm -f org/xml/sax/ext/LexicalHandler.$(OBJEXT)
-rm -f org/xml/sax/ext/LexicalHandler.lo
-rm -f org/xml/sax/ext/Locator2.$(OBJEXT)
-rm -f org/xml/sax/ext/Locator2.lo
-rm -f org/xml/sax/ext/Locator2Impl.$(OBJEXT)
-rm -f org/xml/sax/ext/Locator2Impl.lo
-rm -f org/xml/sax/helpers/AttributeListImpl.$(OBJEXT)
-rm -f org/xml/sax/helpers/AttributeListImpl.lo
-rm -f org/xml/sax/helpers/AttributesImpl.$(OBJEXT)
-rm -f org/xml/sax/helpers/AttributesImpl.lo
-rm -f org/xml/sax/helpers/DefaultHandler.$(OBJEXT)
-rm -f org/xml/sax/helpers/DefaultHandler.lo
-rm -f org/xml/sax/helpers/LocatorImpl.$(OBJEXT)
-rm -f org/xml/sax/helpers/LocatorImpl.lo
-rm -f org/xml/sax/helpers/NamespaceSupport.$(OBJEXT)
-rm -f org/xml/sax/helpers/NamespaceSupport.lo
-rm -f org/xml/sax/helpers/NewInstance.$(OBJEXT)
-rm -f org/xml/sax/helpers/NewInstance.lo
-rm -f org/xml/sax/helpers/ParserAdapter.$(OBJEXT)
-rm -f org/xml/sax/helpers/ParserAdapter.lo
-rm -f org/xml/sax/helpers/ParserFactory.$(OBJEXT)
-rm -f org/xml/sax/helpers/ParserFactory.lo
-rm -f org/xml/sax/helpers/XMLFilterImpl.$(OBJEXT)
-rm -f org/xml/sax/helpers/XMLFilterImpl.lo
-rm -f org/xml/sax/helpers/XMLReaderAdapter.$(OBJEXT)
-rm -f org/xml/sax/helpers/XMLReaderAdapter.lo
-rm -f org/xml/sax/helpers/XMLReaderFactory.$(OBJEXT)
-rm -f org/xml/sax/helpers/XMLReaderFactory.lo
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/AttributeList.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/Attributes.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/ContentHandler.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/DTDHandler.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/DocumentHandler.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/EntityResolver.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/ErrorHandler.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/HandlerBase.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/InputSource.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/Locator.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/Parser.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXException.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXNotRecognizedException.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXNotSupportedException.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/SAXParseException.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/XMLFilter.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/$(DEPDIR)/XMLReader.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/Attributes2.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/Attributes2Impl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/DeclHandler.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/DefaultHandler2.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/EntityResolver2.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/LexicalHandler.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/Locator2.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/ext/$(DEPDIR)/Locator2Impl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/AttributeListImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/AttributesImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/DefaultHandler.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/LocatorImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/NamespaceSupport.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/NewInstance.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/ParserAdapter.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/ParserFactory.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/XMLFilterImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/XMLReaderAdapter.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@org/xml/sax/helpers/$(DEPDIR)/XMLReaderFactory.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsax_gcj_la-sax.Plo@am__quote@
.java.o:
.jar.o:
@am__fastdepGCJ_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
@am__fastdepGCJ_TRUE@ if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
@am__fastdepGCJ_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
@ -646,7 +439,7 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepGCJ_FALSE@ DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ $<
.java.obj:
.jar.obj:
@am__fastdepGCJ_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
@am__fastdepGCJ_TRUE@ if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
@am__fastdepGCJ_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
@ -654,7 +447,7 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepGCJ_FALSE@ DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.java.lo:
.jar.lo:
@am__fastdepGCJ_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
@am__fastdepGCJ_TRUE@ if $(LTGCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
@am__fastdepGCJ_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
@ -662,14 +455,18 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepGCJ_FALSE@ DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepGCJ_FALSE@ $(LTGCJCOMPILE) -c -o $@ $<
libsax_gcj_la-sax.lo: sax.jar
@am__fastdepGCJ_TRUE@ if $(LIBTOOL) --mode=compile $(GCJ) $(libsax_gcj_la_GCJFLAGS) $(GCJFLAGS) -MT libsax_gcj_la-sax.lo -MD -MP -MF "$(DEPDIR)/libsax_gcj_la-sax.Tpo" -c -o libsax_gcj_la-sax.lo `test -f 'sax.jar' || echo '$(srcdir)/'`sax.jar; \
@am__fastdepGCJ_TRUE@ then mv -f "$(DEPDIR)/libsax_gcj_la-sax.Tpo" "$(DEPDIR)/libsax_gcj_la-sax.Plo"; else rm -f "$(DEPDIR)/libsax_gcj_la-sax.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepGCJ_FALSE@ source='sax.jar' object='libsax_gcj_la-sax.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepGCJ_FALSE@ DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepGCJ_FALSE@ $(LIBTOOL) --mode=compile $(GCJ) $(libsax_gcj_la_GCJFLAGS) $(GCJFLAGS) -c -o libsax_gcj_la-sax.lo `test -f 'sax.jar' || echo '$(srcdir)/'`sax.jar
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
-rm -rf org/xml/sax/.libs org/xml/sax/_libs
-rm -rf org/xml/sax/ext/.libs org/xml/sax/ext/_libs
-rm -rf org/xml/sax/helpers/.libs org/xml/sax/helpers/_libs
distclean-libtool:
-rm -f libtool
@ -755,6 +552,9 @@ check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(LTLIBRARIES)
installdirs:
for dir in "$(DESTDIR)$(toolexeclibdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-am
install-exec: install-exec-am
@ -776,12 +576,6 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-rm -f org/xml/sax/$(DEPDIR)/$(am__dirstamp)
-rm -f org/xml/sax/$(am__dirstamp)
-rm -f org/xml/sax/ext/$(DEPDIR)/$(am__dirstamp)
-rm -f org/xml/sax/ext/$(am__dirstamp)
-rm -f org/xml/sax/helpers/$(DEPDIR)/$(am__dirstamp)
-rm -f org/xml/sax/helpers/$(am__dirstamp)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@ -789,11 +583,11 @@ maintainer-clean-generic:
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-am
clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
clean-am: clean-generic clean-libtool clean-toolexeclibLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
-rm -rf org/xml/sax/$(DEPDIR) org/xml/sax/ext/$(DEPDIR) org/xml/sax/helpers/$(DEPDIR)
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-libtool distclean-tags
@ -810,7 +604,7 @@ info-am:
install-data-am:
install-exec-am:
install-exec-am: install-toolexeclibLTLIBRARIES
install-info: install-info-am
@ -819,7 +613,7 @@ install-man:
installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -rf org/xml/sax/$(DEPDIR) org/xml/sax/ext/$(DEPDIR) org/xml/sax/helpers/$(DEPDIR)
-rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@ -836,29 +630,33 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-info-am
uninstall-am: uninstall-info-am uninstall-toolexeclibLTLIBRARIES
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstLTLIBRARIES ctags distclean \
clean-libtool clean-toolexeclibLTLIBRARIES ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
mostlyclean-local pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-info-am
install-strip install-toolexeclibLTLIBRARIES installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
uninstall-toolexeclibLTLIBRARIES
classes.stamp: $(libsax_convenience_la_SOURCES)
sax.jar: classes.stamp
find org -name '*.class' -print | $(ZIP) -cfME@ $@
classes.stamp: $(source_files)
here=`pwd`; cd $(srcdir); \
$(GCJ_WITH_FLAGS) -C -d $$here $(libsax_convenience_la_SOURCES)
$(GCJ_WITH_FLAGS) -C -d $$here $(source_files)
echo > classes.stamp
mostlyclean-local:
-find . -name '*.class' | xargs rm
-rm classes.stamp
-rm classes.stamp sax.jar
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

5
libjava/external/sax/org/xml/sax/helpers/NamespaceSupport.java vendored
View file

@ -2,7 +2,7 @@
// http://www.saxproject.org
// Written by David Megginson
// This class is in the Public Domain. NO WARRANTY!
// $Id: NamespaceSupport.java,v 1.1 2004/12/23 22:38:42 mark Exp $
// $Id: NamespaceSupport.java,v 1.1 2005/02/02 00:41:54 tromey Exp $
package org.xml.sax.helpers;
@ -113,7 +113,8 @@ public class NamespaceSupport
/**
* An empty enumeration.
*/
private final static Enumeration EMPTY_ENUMERATION =
// GCJ LOCAL: work around gcj bug by making this package-private
final static Enumeration EMPTY_ENUMERATION =
new Vector().elements();

19
libjava/external/w3c_dom/Makefile.am vendored
View file

@ -5,6 +5,9 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
## Needed because $(ZIP) is a relative path.
MULTIBUILDTOP = ../../
## The compiler with whatever flags we want for both -c and -C
## compiles.
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
@ -20,18 +23,24 @@ AM_GCJFLAGS = \
BUILT_SOURCES = classes.stamp
classes.stamp: $(libw3c_convenience_la_SOURCES)
w3c.jar: classes.stamp
find org -name '*.class' -print | $(ZIP) -cfME@ $@
classes.stamp: $(source_files)
here=`pwd`; cd $(srcdir); \
$(GCJ_WITH_FLAGS) -C -d $$here $(libw3c_convenience_la_SOURCES)
$(GCJ_WITH_FLAGS) -C -d $$here $(source_files)
echo > classes.stamp
mostlyclean-local:
-find . -name '*.class' | xargs rm
-rm classes.stamp
-rm classes.stamp w3c.jar
noinst_LTLIBRARIES = libw3c_convenience.la
toolexeclib_LTLIBRARIES = libw3c-gcj.la
libw3c_convenience_la_SOURCES = \
libw3c_gcj_la_SOURCES = w3c.jar
libw3c_gcj_la_GCJFLAGS = -findirect-dispatch
source_files = \
org/w3c/dom/xpath/XPathNamespace.java \
org/w3c/dom/xpath/XPathResult.java \
org/w3c/dom/xpath/XPathException.java \

1138
libjava/external/w3c_dom/Makefile.in vendored
View file

File diff suppressed because it is too large Load diff

4
libjava/gcj/Makefile.in
View file

@ -1,8 +1,8 @@
# Makefile.in generated by automake 1.9.5 from Makefile.am.
# Makefile.in generated by automake 1.9.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# 2003, 2004 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

102
libjava/gnu/gcj/runtime/BootClassLoader.java Normal file
View file

@ -0,0 +1,102 @@
/* Copyright (C) 2005 Free Software Foundation
This file is part of libgcj.
This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
package gnu.gcj.runtime;
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.StringTokenizer;
/**
* This is a helper for the bootstrap class loader. It is a
* URLClassLoader so that we can read a class path and re-use all the
* existing code for finding classes, extracting them from jars, etc.
* However, it is never called the way that an ordinary ClassLoader is
* called. For instance, loadClass() is never used.
*/
public final class BootClassLoader extends URLClassLoader
{
BootClassLoader(String libdir)
{
super(new URL[0]);
// Add the contents of the endorsed directories.
StringTokenizer st
= new StringTokenizer (System.getProperty ("java.endorsed.dirs", ""),
File.pathSeparator);
try
{
while (st.hasMoreElements ())
{
String dirname = st.nextToken ();
File dir = new File (dirname);
if (dir.exists ())
{
if (! dirname.endsWith (File.separator))
dirname = dirname + File.separator;
String files[] = dir.list (new FilenameFilter ()
{
public boolean accept (File dir, String name)
{
return name.endsWith (".jar") || name.endsWith (".zip");
}
});
for (int i = files.length - 1; i >= 0; i--)
addURL(new URL("file", "", -1, dirname + files[i]));
}
}
String w3clib = (libdir + File.separator
+ System.mapLibraryName ("w3c-gcj"));
addURL(new URL("gcjlib", "", -1, w3clib));
String saxlib = (libdir + File.separator
+ System.mapLibraryName ("sax-gcj"));
addURL(new URL("gcjlib", "", -1, saxlib));
}
catch (java.net.MalformedURLException x)
{
// This should never happen.
throw new RuntimeException(x);
}
}
public Class bootLoadClass(String name)
throws ClassNotFoundException
{
Class c = findLoadedClass(name);
if (c == null)
{
try
{
// We could hack URLClassLoader to make this more
// efficient, if it mattered.
c = findClass(name);
}
catch (ClassNotFoundException _)
{
c = null;
}
}
return c;
}
public URL bootGetResource(String name)
{
return findResource(name);
}
public Enumeration bootGetResources(String name) throws IOException
{
return findResources(name);
}
}

283
libjava/gnu/xml/aelfred2/JAXPFactory.java
View file

@ -60,137 +60,172 @@ import javax.xml.parsers.SAXParserFactory;
*
* @author David Brownell
*/
public final class JAXPFactory extends SAXParserFactory
public final class JAXPFactory
extends SAXParserFactory
{
private Hashtable flags = new Hashtable ();
private Hashtable flags = new Hashtable();
/**
* Constructs a factory which normally returns a non-validating
* parser.
*/
public JAXPFactory () { }
/**
* Constructs a factory which normally returns a non-validating
* parser.
*/
public JAXPFactory()
{
}
public SAXParser newSAXParser ()
public SAXParser newSAXParser()
throws ParserConfigurationException, SAXException
{
JaxpParser jaxp = new JaxpParser ();
Enumeration e = flags.keys ();
XMLReader parser = jaxp.getXMLReader ();
{
JaxpParser jaxp = new JaxpParser();
Enumeration e = flags.keys();
XMLReader parser = jaxp.getXMLReader();
parser.setFeature (
SAXDriver.FEATURE + "namespaces",
isNamespaceAware ());
parser.setFeature (
SAXDriver.FEATURE + "validation",
isValidating ());
// that makes SAX2 feature flags trump JAXP
parser.setFeature(SAXDriver.FEATURE + "namespaces",
isNamespaceAware());
parser.setFeature(SAXDriver.FEATURE + "validation",
isValidating());
// that makes SAX2 feature flags trump JAXP
while (e.hasMoreElements())
{
String uri = (String) e.nextElement();
Boolean value = (Boolean) flags.get(uri);
parser.setFeature(uri, value.booleanValue());
}
while (e.hasMoreElements ()) {
String uri = (String) e.nextElement ();
Boolean value = (Boolean) flags.get (uri);
parser.setFeature (uri, value.booleanValue ());
}
return jaxp;
}
return jaxp;
}
// yes, this "feature transfer" mechanism doesn't play well
public void setFeature (String name, boolean value)
throws
ParserConfigurationException,
SAXNotRecognizedException,
SAXNotSupportedException
{
try {
// force "early" detection of errors where possible
// (flags can't necessarily be set before parsing)
new JaxpParser ().getXMLReader ().setFeature (name, value);
flags.put (name, new Boolean (value));
} catch (SAXNotRecognizedException e) {
throw new SAXNotRecognizedException (name);
} catch (SAXNotSupportedException e) {
throw new SAXNotSupportedException (name);
} catch (Exception e) {
throw new ParserConfigurationException (
e.getClass ().getName ()
+ ": "
+ e.getMessage ());
}
}
public boolean getFeature (String name)
throws
ParserConfigurationException,
SAXNotRecognizedException,
SAXNotSupportedException
{
Boolean value = (Boolean) flags.get (name);
if (value != null)
return value.booleanValue ();
else
try {
return new JaxpParser ().getXMLReader ().getFeature (name);
} catch (SAXNotRecognizedException e) {
throw new SAXNotRecognizedException (name);
} catch (SAXNotSupportedException e) {
throw new SAXNotSupportedException (name);
} catch (SAXException e) {
throw new ParserConfigurationException (
e.getClass ().getName ()
+ ": "
+ e.getMessage ());
}
}
private static class JaxpParser extends SAXParser
{
private XmlReader ae2 = new XmlReader ();
private XMLReaderAdapter parser = null;
JaxpParser () { }
public void setProperty (String id, Object value)
throws SAXNotRecognizedException, SAXNotSupportedException
{ ae2.setProperty (id, value); }
public Object getProperty (String id)
throws SAXNotRecognizedException, SAXNotSupportedException
{ return ae2.getProperty (id); }
public Parser getParser ()
throws SAXException
{
if (parser == null)
parser = new XMLReaderAdapter (ae2);
return parser;
}
public XMLReader getXMLReader ()
throws SAXException
{ return ae2; }
public boolean isNamespaceAware ()
{
try {
return ae2.getFeature (SAXDriver.FEATURE + "namespaces");
} catch (Exception e) {
throw new Error ();
}
}
public boolean isValidating ()
{
try {
return ae2.getFeature (SAXDriver.FEATURE + "validation");
} catch (Exception e) {
throw new Error ();
}
}
// TODO isXIncludeAware()
// yes, this "feature transfer" mechanism doesn't play well
public void setFeature(String name, boolean value)
throws ParserConfigurationException, SAXNotRecognizedException,
SAXNotSupportedException
{
try
{
// force "early" detection of errors where possible
// (flags can't necessarily be set before parsing)
new JaxpParser().getXMLReader().setFeature(name, value);
flags.put(name, new Boolean(value));
}
catch (SAXNotRecognizedException e)
{
throw new SAXNotRecognizedException(name);
}
catch (SAXNotSupportedException e)
{
throw new SAXNotSupportedException(name);
}
catch (Exception e)
{
throw new ParserConfigurationException(e.getClass().getName()
+ ": "
+ e.getMessage());
}
}
public boolean getFeature(String name)
throws ParserConfigurationException, SAXNotRecognizedException,
SAXNotSupportedException
{
Boolean value = (Boolean) flags.get(name);
if (value != null)
{
return value.booleanValue();
}
else
{
try
{
return new JaxpParser().getXMLReader().getFeature(name);
}
catch (SAXNotRecognizedException e)
{
throw new SAXNotRecognizedException(name);
}
catch (SAXNotSupportedException e)
{
throw new SAXNotSupportedException(name);
}
catch (SAXException e)
{
throw new ParserConfigurationException(e.getClass().getName()
+ ": "
+ e.getMessage());
}
}
}
private static class JaxpParser
extends SAXParser
{
private XmlReader ae2 = new XmlReader();
private XMLReaderAdapter parser = null;
JaxpParser()
{
}
public void setProperty(String id, Object value)
throws SAXNotRecognizedException, SAXNotSupportedException
{
ae2.setProperty(id, value);
}
public Object getProperty(String id)
throws SAXNotRecognizedException, SAXNotSupportedException
{
return ae2.getProperty(id);
}
public Parser getParser()
throws SAXException
{
if (parser == null)
{
parser = new XMLReaderAdapter(ae2);
}
return parser;
}
public XMLReader getXMLReader ()
throws SAXException
{
return ae2;
}
public boolean isNamespaceAware()
{
try
{
return ae2.getFeature(SAXDriver.FEATURE + "namespaces");
}
catch (Exception e)
{
throw new Error();
}
}
public boolean isValidating()
{
try
{
return ae2.getFeature(SAXDriver.FEATURE + "validation");
}
catch (Exception e)
{
throw new Error();
}
}
// TODO isXIncludeAware()
}
}

2602
libjava/gnu/xml/aelfred2/SAXDriver.java
View file

File diff suppressed because it is too large Load diff

10440
libjava/gnu/xml/aelfred2/XmlParser.java
View file

File diff suppressed because it is too large Load diff

473
libjava/gnu/xml/aelfred2/XmlReader.java
View file

@ -70,246 +70,305 @@ import gnu.xml.pipeline.ValidationConsumer;
*
* @author David Brownell
*/
public final class XmlReader implements XMLReader
public final class XmlReader
implements XMLReader
{
private SAXDriver aelfred2 = new SAXDriver ();
private EventFilter filter = new EventFilter ();
private boolean isValidating;
private boolean active;
/** Constructs a SAX Parser. */
public XmlReader ()
{ }
/**
* Constructs a SAX Parser, optionally treating validity errors
* as if they were fatal errors.
*/
public XmlReader (boolean invalidIsFatal)
static class FatalErrorHandler
extends DefaultHandler2
{
public void error(SAXParseException e)
throws SAXException
{
if (invalidIsFatal)
setErrorHandler (new DefaultHandler2 () {
public void error (SAXParseException e)
throws SAXException
{ throw e; }
});
throw e;
}
}
private SAXDriver aelfred2 = new SAXDriver();
private EventFilter filter = new EventFilter();
private boolean isValidating;
private boolean active;
/**
* <b>SAX2</b>: Returns the object used to report the logical
* content of an XML document.
*/
public ContentHandler getContentHandler ()
{ return filter.getContentHandler (); }
/**
* Constructs a SAX Parser.
*/
public XmlReader()
{
}
/**
* <b>SAX2</b>: Assigns the object used to report the logical
* content of an XML document.
* @exception IllegalStateException if called mid-parse
*/
public void setContentHandler (ContentHandler handler)
{
if (active)
throw new IllegalStateException ("already parsing");
filter.setContentHandler (handler);
}
/**
* Constructs a SAX Parser, optionally treating validity errors
* as if they were fatal errors.
*/
public XmlReader(boolean invalidIsFatal)
{
if (invalidIsFatal)
{
setErrorHandler(new FatalErrorHandler());
}
}
/**
* <b>SAX2</b>: Returns the object used to report the logical
* content of an XML document.
*/
public ContentHandler getContentHandler()
{
return filter.getContentHandler();
}
/**
* <b>SAX2</b>: Returns the object used to process declarations related
* to notations and unparsed entities.
*/
public DTDHandler getDTDHandler ()
{ return filter.getDTDHandler (); }
/**
* <b>SAX2</b>: Assigns the object used to report the logical
* content of an XML document.
* @exception IllegalStateException if called mid-parse
*/
public void setContentHandler(ContentHandler handler)
{
if (active)
{
throw new IllegalStateException("already parsing");
}
filter.setContentHandler(handler);
}
/**
* <b>SAX1</b> Assigns DTD handler
* @exception IllegalStateException if called mid-parse
*/
public void setDTDHandler (DTDHandler handler)
{
if (active)
throw new IllegalStateException ("already parsing");
filter.setDTDHandler (handler);
}
/**
* <b>SAX2</b>: Returns the object used to process declarations related
* to notations and unparsed entities.
*/
public DTDHandler getDTDHandler()
{
return filter.getDTDHandler();
}
/**
* <b>SAX2</b>: Returns the object used when resolving external
* entities during parsing (both general and parameter entities).
*/
public EntityResolver getEntityResolver ()
{ return aelfred2.getEntityResolver (); }
/**
* <b>SAX1</b> Assigns DTD handler
* @exception IllegalStateException if called mid-parse
*/
public void setDTDHandler(DTDHandler handler)
{
if (active)
{
throw new IllegalStateException("already parsing");
}
filter.setDTDHandler(handler);
}
/**
* <b>SAX2</b>: Returns the object used when resolving external
* entities during parsing (both general and parameter entities).
*/
public EntityResolver getEntityResolver()
{
return aelfred2.getEntityResolver();
}
/** <b>SAX1</b> Assigns parser's entity resolver */
public void setEntityResolver (EntityResolver handler)
{ aelfred2.setEntityResolver (handler); }
/**
* <b>SAX1</b> Assigns parser's entity resolver
*/
public void setEntityResolver(EntityResolver handler)
{
aelfred2.setEntityResolver(handler);
}
/**
* <b>SAX2</b>: Returns the object used to receive callbacks for XML
* errors of all levels (fatal, nonfatal, warning); this is never null;
*/
public ErrorHandler getErrorHandler ()
{ return aelfred2.getErrorHandler (); }
/**
* <b>SAX2</b>: Returns the object used to receive callbacks for XML
* errors of all levels (fatal, nonfatal, warning); this is never null;
*/
public ErrorHandler getErrorHandler()
{
return aelfred2.getErrorHandler();
}
/**
* <b>SAX1</b> Assigns error handler
* @exception IllegalStateException if called mid-parse
*/
public void setErrorHandler (ErrorHandler handler)
{
if (active)
throw new IllegalStateException ("already parsing");
aelfred2.setErrorHandler (handler);
}
/**
* <b>SAX1</b> Assigns error handler
* @exception IllegalStateException if called mid-parse
*/
public void setErrorHandler(ErrorHandler handler)
{
if (active)
{
throw new IllegalStateException("already parsing");
}
aelfred2.setErrorHandler(handler);
}
/**
* <b>SAX2</b>: Assigns the specified property.
* @exception IllegalStateException if called mid-parse
*/
public void setProperty (String propertyId, Object value)
/**
* <b>SAX2</b>: Assigns the specified property.
* @exception IllegalStateException if called mid-parse
*/
public void setProperty(String propertyId, Object value)
throws SAXNotRecognizedException, SAXNotSupportedException
{
if (active)
throw new IllegalStateException ("already parsing");
if (getProperty (propertyId) != value)
filter.setProperty (propertyId, value);
}
{
if (active)
{
throw new IllegalStateException("already parsing");
}
if (getProperty(propertyId) != value)
{
filter.setProperty(propertyId, value);
}
}
/**
* <b>SAX2</b>: Returns the specified property.
*/
public Object getProperty (String propertyId)
/**
* <b>SAX2</b>: Returns the specified property.
*/
public Object getProperty(String propertyId)
throws SAXNotRecognizedException
{
if ((SAXDriver.PROPERTY + "declaration-handler")
.equals (propertyId)
|| (SAXDriver.PROPERTY + "lexical-handler")
.equals (propertyId))
return filter.getProperty (propertyId);
throw new SAXNotRecognizedException (propertyId);
}
private void forceValidating ()
{
if ((SAXDriver.PROPERTY + "declaration-handler").equals(propertyId)
|| (SAXDriver.PROPERTY + "lexical-handler").equals(propertyId))
{
return filter.getProperty(propertyId);
}
throw new SAXNotRecognizedException(propertyId);
}
private void forceValidating()
throws SAXNotRecognizedException, SAXNotSupportedException
{
aelfred2.setFeature (
SAXDriver.FEATURE + "namespace-prefixes",
true);
aelfred2.setFeature (
SAXDriver.FEATURE + "external-general-entities",
true);
aelfred2.setFeature (
SAXDriver.FEATURE + "external-parameter-entities",
true);
}
{
aelfred2.setFeature(SAXDriver.FEATURE + "namespace-prefixes",
true);
aelfred2.setFeature(SAXDriver.FEATURE + "external-general-entities",
true);
aelfred2.setFeature(SAXDriver.FEATURE + "external-parameter-entities",
true);
}
/**
* <b>SAX2</b>: Sets the state of features supported in this parser.
* Note that this parser requires reporting of namespace prefixes when
* validating.
*/
public void setFeature (String featureId, boolean state)
/**
* <b>SAX2</b>: Sets the state of features supported in this parser.
* Note that this parser requires reporting of namespace prefixes when
* validating.
*/
public void setFeature(String featureId, boolean state)
throws SAXNotRecognizedException, SAXNotSupportedException
{
boolean value = getFeature (featureId);
{
boolean value = getFeature(featureId);
if (state == value)
return;
if (state == value)
{
return;
}
if ((SAXDriver.FEATURE + "validation").equals (featureId)) {
if (active)
throw new SAXNotSupportedException ("already parsing");
if (state)
forceValidating ();
isValidating = state;
} else
aelfred2.setFeature (featureId, state);
}
if ((SAXDriver.FEATURE + "validation").equals(featureId))
{
if (active)
{
throw new SAXNotSupportedException("already parsing");
}
if (state)
{
forceValidating();
}
isValidating = state;
}
else
{
aelfred2.setFeature(featureId, state);
}
}
/**
* <b>SAX2</b>: Tells whether this parser supports the specified feature.
* At this time, this directly parallels the underlying SAXDriver,
* except that validation is optionally supported.
*
* @see SAXDriver
*/
public boolean getFeature (String featureId)
/**
* <b>SAX2</b>: Tells whether this parser supports the specified feature.
* At this time, this directly parallels the underlying SAXDriver,
* except that validation is optionally supported.
*
* @see SAXDriver
*/
public boolean getFeature(String featureId)
throws SAXNotRecognizedException, SAXNotSupportedException
{
if ((SAXDriver.FEATURE + "validation").equals (featureId))
return isValidating;
{
if ((SAXDriver.FEATURE + "validation").equals(featureId))
{
return isValidating;
}
return aelfred2.getFeature (featureId);
}
return aelfred2.getFeature(featureId);
}
/**
* <b>SAX1</b>: Sets the locale used for diagnostics; currently,
* only locales using the English language are supported.
* @param locale The locale for which diagnostics will be generated
*/
public void setLocale (Locale locale)
/**
* <b>SAX1</b>: Sets the locale used for diagnostics; currently,
* only locales using the English language are supported.
* @param locale The locale for which diagnostics will be generated
*/
public void setLocale(Locale locale)
throws SAXException
{ aelfred2.setLocale (locale); }
{
aelfred2.setLocale(locale);
}
/**
* <b>SAX1</b>: Preferred API to parse an XML document, using a
* system identifier (URI).
/**
* <b>SAX1</b>: Preferred API to parse an XML document, using a
* system identifier (URI).
*/
public void parse (String systemId)
public void parse(String systemId)
throws SAXException, IOException
{
parse (new InputSource (systemId));
}
{
parse(new InputSource(systemId));
}
/**
* <b>SAX1</b>: Underlying API to parse an XML document, used
* directly when no URI is available. When this is invoked,
* and the parser is set to validate, some features will be
* automatically reset to appropriate values: for reporting
* namespace prefixes, and incorporating external entities.
*
* @param source The XML input source.
*
* @exception IllegalStateException if called mid-parse
* @exception SAXException The handlers may throw any SAXException,
* and the parser normally throws SAXParseException objects.
* @exception IOException IOExceptions are normally through through
* the parser if there are problems reading the source document.
*/
public void parse (InputSource source)
/**
* <b>SAX1</b>: Underlying API to parse an XML document, used
* directly when no URI is available. When this is invoked,
* and the parser is set to validate, some features will be
* automatically reset to appropriate values: for reporting
* namespace prefixes, and incorporating external entities.
*
* @param source The XML input source.
*
* @exception IllegalStateException if called mid-parse
* @exception SAXException The handlers may throw any SAXException,
* and the parser normally throws SAXParseException objects.
* @exception IOException IOExceptions are normally through through
* the parser if there are problems reading the source document.
*/
public void parse(InputSource source)
throws SAXException, IOException
{
EventFilter next;
boolean nsdecls;
{
EventFilter next;
boolean nsdecls;
synchronized (aelfred2) {
if (active)
throw new IllegalStateException ("already parsing");
active = true;
}
synchronized (aelfred2)
{
if (active)
{
throw new IllegalStateException("already parsing");
}
active = true;
}
// set up the output pipeline
if (isValidating) {
forceValidating ();
next = new ValidationConsumer (filter);
} else
next = filter;
// set up the output pipeline
if (isValidating)
{
forceValidating();
next = new ValidationConsumer(filter);
}
else
{
next = filter;
}
// connect pipeline and error handler
// don't let _this_ call to bind() affect xmlns* attributes
nsdecls = aelfred2.getFeature (
SAXDriver.FEATURE + "namespace-prefixes");
EventFilter.bind (aelfred2, next);
if (!nsdecls)
aelfred2.setFeature (
SAXDriver.FEATURE + "namespace-prefixes",
false);
// connect pipeline and error handler
// don't let _this_ call to bind() affect xmlns* attributes
nsdecls = aelfred2.getFeature(SAXDriver.FEATURE + "namespace-prefixes");
EventFilter.bind(aelfred2, next);
if (!nsdecls)
{
aelfred2.setFeature(SAXDriver.FEATURE + "namespace-prefixes",
false);
}
// parse, clean up
try
{
aelfred2.parse(source);
}
finally
{
active = false;
}
}
// parse, clean up
try {
aelfred2.parse (source);
} finally {
active = false;
}
}
}

4
libjava/include/Makefile.in
View file

@ -1,8 +1,8 @@
# Makefile.in generated by automake 1.9.5 from Makefile.am.
# Makefile.in generated by automake 1.9.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# 2003, 2004 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

12
libjava/java/lang/VMClassLoader.java
View file

@ -53,6 +53,7 @@ import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import java.util.StringTokenizer;
import gnu.gcj.runtime.BootClassLoader;
/**
* java.lang.VMClassLoader is a package-private helper for VMs to implement
@ -82,6 +83,10 @@ final class VMClassLoader
static final HashMap definedPackages = new HashMap();
// This is a helper for handling java.endorsed.dirs. It is null
// until we've initialized the system, at which point it is created.
static BootClassLoader bootLoader;
/**
* Helper to define a class using a string of bytes. This assumes that
* the security checks have already been performed, if necessary.
@ -153,6 +158,8 @@ final class VMClassLoader
*/
static URL getResource(String name)
{
if (bootLoader != null)
return bootLoader.bootGetResource(name);
return null;
}
@ -168,6 +175,8 @@ final class VMClassLoader
*/
static Enumeration getResources(String name) throws IOException
{
if (bootLoader != null)
return bootLoader.bootGetResources(name);
return EmptyEnumeration.getInstance();
}
@ -287,6 +296,8 @@ final class VMClassLoader
static native ClassLoader getSystemClassLoaderInternal();
static native void initBootLoader(String libdir);
static ClassLoader getSystemClassLoader()
{
// This method is called as the initialization of systemClassLoader,
@ -310,6 +321,7 @@ final class VMClassLoader
+ loader, ex);
}
}
return default_sys;
}
}

20
libjava/java/lang/natClass.cc
View file

@ -126,16 +126,16 @@ java::lang::Class::getClassLoader (void)
s->checkPermission (new RuntimePermission (JvNewStringLatin1 ("getClassLoader")));
}
// The spec requires us to return `null' for primitive classes. In
// other cases we have the option of returning `null' for classes
// loaded with the bootstrap loader. All gcj-compiled classes which
// are linked into the application used to return `null' here, but
// that confuses some poorly-written applications. It is a useful
// and apparently harmless compatibility hack to simply never return
// `null' instead.
if (isPrimitive ())
return NULL;
return loader ? loader : ClassLoader::systemClassLoader;
// This particular 'return' has been changed a couple of times over
// libgcj's history. This particular approach is a little weird,
// because it means that all classes linked into the application
// will see NULL for their class loader. This may confuse some
// applications that aren't expecting this; the solution is to use a
// different linking model for these applications. In the past we
// returned the system class loader in this case, but that is
// incorrect. Also, back then we didn't have other linkage models
// to fall back on.
return loader;
}
java::lang::reflect::Constructor *

36
libjava/java/lang/natClassLoader.cc
View file

@ -43,6 +43,7 @@ details. */
#include <java/io/Serializable.h>
#include <java/lang/Cloneable.h>
#include <java/util/HashMap.h>
#include <gnu/gcj/runtime/BootClassLoader.h>
// Size of local hash table.
#define HASH_LEN 1013
@ -106,7 +107,7 @@ void
_Jv_RegisterInitiatingLoader (jclass klass, java::lang::ClassLoader *loader)
{
if (! loader)
loader = java::lang::ClassLoader::systemClassLoader;
loader = java::lang::VMClassLoader::bootLoader;
loader->loadedClasses->put(klass->name->toString(), klass);
}
@ -116,7 +117,7 @@ void
_Jv_UnregisterInitiatingLoader (jclass klass, java::lang::ClassLoader *loader)
{
if (! loader)
loader = java::lang::ClassLoader::systemClassLoader;
loader = java::lang::VMClassLoader::bootLoader;
loader->loadedClasses->remove(klass->name->toString());
}
@ -211,13 +212,14 @@ _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader)
// See if the class was already loaded by this loader. This handles
// initiating loader checks, as we register classes with their
// initiating loaders.
java::lang::ClassLoader *sys = java::lang::ClassLoader::systemClassLoader;
java::lang::ClassLoader *boot = java::lang::VMClassLoader::bootLoader;
java::lang::ClassLoader *real = loader;
if (! real)
real = sys;
real = boot;
jstring sname = name->toString();
// We might still be bootstrapping the VM, in which case there
// won't be a system class loader yet.
// won't be a bootstrap class loader yet.
jclass klass = real ? real->findLoadedClass (sname) : NULL;
if (! klass)
@ -230,16 +232,16 @@ _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader)
// If "loader" delegated the loadClass operation to another
// loader, explicitly register that it is also an initiating
// loader of the given class.
java::lang::ClassLoader *delegate = (loader == sys
java::lang::ClassLoader *delegate = (loader == boot
? NULL
: loader);
if (klass && klass->getClassLoaderInternal () != delegate)
_Jv_RegisterInitiatingLoader (klass, loader);
}
else if (sys)
else if (boot)
{
// Load using the bootstrap loader jvmspec 5.3.1.
klass = sys->loadClass (sname, false);
klass = java::lang::VMClassLoader::loadClass (sname, false);
// Register that we're an initiating loader.
if (klass)
@ -250,9 +252,21 @@ _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader)
// Not even a bootstrap loader, try the built-in cache.
klass = _Jv_FindClassInCache (name);
if (bootstrap_index == BOOTSTRAP_CLASS_LIST_SIZE)
abort ();
bootstrap_class_list[bootstrap_index++] = klass;
bool found = false;
for (int i = 0; i < bootstrap_index; ++i)
{
if (bootstrap_class_list[i] == klass)
{
found = true;
break;
}
}
if (! found)
{
if (bootstrap_index == BOOTSTRAP_CLASS_LIST_SIZE)
abort ();
bootstrap_class_list[bootstrap_index++] = klass;
}
}
}
else

25
libjava/java/lang/natVMClassLoader.cc
View file

@ -25,6 +25,7 @@ details. */
#include <java/lang/VMCompiler.h>
#include <gnu/gcj/runtime/VMClassLoader.h>
#include <gnu/gcj/runtime/SystemClassLoader.h>
#include <gnu/gcj/runtime/BootClassLoader.h>
#include <java/lang/ClassLoader.h>
#include <java/lang/Class.h>
#include <java/lang/Throwable.h>
@ -66,9 +67,9 @@ java::lang::VMClassLoader::defineClass (java::lang::ClassLoader *loader,
// until we're done loading.
JvSynchronize sync (klass);
// Record the defining loader. For the system class loader, we
// record NULL.
if (loader != java::lang::ClassLoader::systemClassLoader)
// Record the defining loader. For the bootstrap class loader,
// we record NULL.
if (loader != bootLoader)
klass->loader = loader;
if (name != 0)
@ -122,11 +123,25 @@ java::lang::VMClassLoader::getPrimitiveClass (jchar type)
return _Jv_FindClassFromSignature (sig, NULL);
}
void
java::lang::VMClassLoader::initBootLoader(jstring libdir)
{
bootLoader = new gnu::gcj::runtime::BootClassLoader(libdir);
}
jclass
java::lang::VMClassLoader::loadClass(jstring name, jboolean resolve)
{
_Jv_Utf8Const *utf = _Jv_makeUtf8Const (name);
jclass klass = _Jv_FindClassInCache (utf);
// We try the boot loader first, so that the endorsed directory
// overrides compiled-in classes.
jclass klass = NULL;
if (bootLoader)
klass = bootLoader->bootLoadClass(name);
if (! klass)
{
_Jv_Utf8Const *utf = _Jv_makeUtf8Const (name);
klass = _Jv_FindClassInCache (utf);
}
if (klass)
{
// We never want to return a class without its supers linked.

9
libjava/prims.cc
View file

@ -55,6 +55,7 @@ details. */
#include <java/lang/OutOfMemoryError.h>
#include <java/lang/System.h>
#include <java/lang/VMThrowable.h>
#include <java/lang/VMClassLoader.h>
#include <java/lang/reflect/Modifier.h>
#include <java/io/PrintStream.h>
#include <java/lang/UnsatisfiedLinkError.h>
@ -1130,8 +1131,9 @@ _Jv_CreateJavaVM (JvVMInitArgs* vm_args)
// of VMClassLoader.
_Jv_InitClass (&java::lang::ClassLoader::class$);
// Set up the system class loader.
// Set up the system class loader and the bootstrap class loader.
gnu::gcj::runtime::VMClassLoader::initialize();
java::lang::VMClassLoader::initBootLoader(JvNewStringLatin1(TOOLEXECLIBDIR));
_Jv_RegisterBootstrapPackages();
@ -1209,7 +1211,10 @@ _Jv_RunMain (jclass klass, const char *name, int argc, const char **argv,
java::lang::System::err->println (JvNewStringLatin1
("Exception during runtime initialization"));
t->printStackTrace();
runtime->exit (1);
if (runtime)
runtime->exit (1);
// In case the runtime creation failed.
::exit (1);
}
_Jv_AttachCurrentThread (main_thread);

2
libjava/stacktrace.cc
View file

@ -495,7 +495,7 @@ _Jv_StackTrace::non_system_trace_fn (_Jv_UnwindState *state)
{
classLoader = frame->klass->getClassLoaderInternal();
#ifdef INTERPRETER
if (classLoader != NULL && classLoader != ClassLoader::systemClassLoader)
if (classLoader != NULL)
{
state->trace_data = (void *) classLoader;
return _URC_NORMAL_STOP;

4
libjava/testsuite/Makefile.in
View file

@ -1,8 +1,8 @@
# Makefile.in generated by automake 1.9.5 from Makefile.am.
# Makefile.in generated by automake 1.9.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# 2003, 2004 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.