diff options
| author | nickc <nickc@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-08-06 09:24:36 +0000 |
|---|---|---|
| committer | nickc <nickc@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-08-06 09:24:36 +0000 |
| commit | 140b44efbc2f0035cbfd23e43d97ae9ffc00c122 (patch) | |
| tree | e67a99f506cc64267629005c5d6776dec918ab74 /libjava | |
| parent | 577f228e66be71b0b41e46fe408abe90286f5fd3 (diff) | |
| download | gcc-140b44efbc2f0035cbfd23e43d97ae9ffc00c122.tar.gz | |
Latest updates from FSF 4.7 branch
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@190174 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
74 files changed, 207 insertions, 120 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 0a8ad9deddd..a7e16cd98b7 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,8 +1,113 @@ -2012-06-14 Release Manager +2011-06-27 Release Manager - * GCC 4.7.1 released. + * GCC 4.3.6 released. -2012-05-21 Benjamin Kosnik <bkoz@redhat.com> +2010-05-22 Release Manager + + * GCC 4.3.5 released. + +2010-05-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + PR other/43620 + * configure.ac (AM_INIT_AUTOMAKE): Add no-dist. + * Makefile.in: Regenerate. + * gcj/Makefile.in: Regenerate. + * include/Makefile.in: Regenerate. + * testsuite/Makefile.in: Regenerate. + +2010-04-09 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> + + Backport: + 2009-12-09 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> + + * include/pa-signal.h: Do not include ucontext.h. + (SIGNAL_HANDLER): Add __attribute__ ((unused)) to signal handler + arguments. + (MAKE_THROW_FRAME): Do not adjust program counter. + * include/hppa-signal.h: Do not include sys/types.h, sys/syscall.h and + unistd.h. + (MAKE_THROW_FRAME): Do not adjust program counter. + (HANDLE_FPE): Define. + (INIT_SEGV, INIT_FPE): Revise indentation. + +2009-08-04 Release Manager + + * GCC 4.3.4 released. + +2009-06-25 Richard Guenther <rguenther@suse.de> + + Backport from mainline + 2008-12-19 Jakub Jelinek <jakub@redhat.com> + + PR libgcj/38396 + * configure.ac (use_libgcj_bc): Set to no if not enable_shared. + (LIBGCJ_SPEC): Use -lgcj instead of -lgcj_bc even for -static + or -static-libgcj. + * Makefile.am (ecjx_SOURCES): Add ecjx.cc. + (ecjx_LDADD): Don't add libgcj.la when + NATIVE && USE_LIBBGCJ_BC. + * ecjx.cc: New file. + * Makefile.in: Regenerated. + * configure: Regenerated. + + 2009-01-11 Matthias Klose <doko@ubuntu.com> + + * Makefile.am (ecjx_LDADD): Add $(extra_ldflags). + * Makefile.in: Regenerate. + +2009-03-13 Andrew Haley <aph@redhat.com> + + * java/lang/natClassLoader.cc (_Jv_RegisterClassHookDefault): Clear + INTERPRETED access modifier. + +2009-01-24 Release Manager + + * GCC 4.3.3 released. + +2009-01-12 Andrew Haley <aph@redhat.com> + + PR libgcj/38396: + * libgcj_bc.c: Sort lines. + *(_Jv_LookupInterfaceMethod, _Jv_MonitorExit, + _Jv_RegisterResource, _Jv_JNI_PopSystemFrame): Add. + + * sun/misc/natUnsafe.cc (spinlock contructor): Call sched_yield(). + +2008-08-27 Release Manager + + * GCC 4.3.2 released. + +2008-08-22 Andrew Haley <aph@redhat.com> + + PR libgcj/8995: + + * interpret-run.cc (REWRITE_INSN): Null this macro. + + * include/jvm.h (class _Jv_Linker): Declare resolve_mutex, init. + (read_cpool_entry, write_cpool_entry): New functions. + * link.cc (_Jv_Linker::resolve_mutex): new. + (_Jv_Linker::init): New function. + (_Jv_Linker::resolve_pool_entry): Use {read,write}_cpool_entry + to ensure atomic access to constant pool entries. + +2008-08-05 Matthias Klose <doko@ubuntu.com> + + PR libgcj/31890 + * gcj/javaprims.h: Regenerate class list. + * HACKING: Update instructions how to build gcj/javaprims.h. + +2008-07-02 Matthias Klose <doko@ubuntu.com> + + * configure.ac: Substitute gcjsubdir. + * Makefile.am (db_pathtail): Use it. + * Makefile.in include/Makefile.in, testsuite/Makefile.in, + gcj/Makefile.in, configure: Regenerate. + +2008-06-06 Release Manager + + * GCC 4.3.1 released. + +2008-05-20 David Daney <ddaney@avtrex.com> PR libstdc++/52700 * configure.ac: Allow gnu, gnu-versioned-namespace for diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 8b79a3a06ef..66a1df0d885 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,7 +1,3 @@ -2012-06-14 Release Manager - - * GCC 4.7.1 released. - 2012-03-22 Release Manager * GCC 4.7.0 released. diff --git a/libjava/classpath/doc/cp-tools.texinfo b/libjava/classpath/doc/cp-tools.texinfo index f7a2d245e7d..5b7bc4d84e5 100644 --- a/libjava/classpath/doc/cp-tools.texinfo +++ b/libjava/classpath/doc/cp-tools.texinfo @@ -2435,14 +2435,14 @@ with the header @samp{CVS ID}, you would specify: Let's say that a class javadoc comment contains @smallexample -@@cvsid $Id: cp-tools.texinfo,v 1.7 2008/08/13 13:32:05 jsumali Exp $ +@@cvsid $Id: cp-tools.texinfo,v 1.6 2012/04/18 17:29:03 nickc Exp $ @end smallexample Then the HTML output will contain something like @smallexample CVS ID: - $Id: cp-tools.texinfo,v 1.7 2008/08/13 13:32:05 jsumali Exp $ + $Id: cp-tools.texinfo,v 1.6 2012/04/18 17:29:03 nickc Exp $ @end smallexample @end table diff --git a/libjava/classpath/external/sax/org/xml/sax/AttributeList.java b/libjava/classpath/external/sax/org/xml/sax/AttributeList.java index cceac8983b9..29e89d62c7f 100644 --- a/libjava/classpath/external/sax/org/xml/sax/AttributeList.java +++ b/libjava/classpath/external/sax/org/xml/sax/AttributeList.java @@ -1,7 +1,7 @@ // SAX Attribute List Interface. // http://www.saxproject.org // No warranty; no copyright -- use this as you will. -// $Id: AttributeList.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: AttributeList.java,v 1.10 2012/04/18 17:29:03 nickc Exp $ package org.xml.sax; diff --git a/libjava/classpath/external/sax/org/xml/sax/Attributes.java b/libjava/classpath/external/sax/org/xml/sax/Attributes.java index 0f3c23682fc..52d56bb766b 100644 --- a/libjava/classpath/external/sax/org/xml/sax/Attributes.java +++ b/libjava/classpath/external/sax/org/xml/sax/Attributes.java @@ -2,7 +2,7 @@ // http://www.saxproject.org // Written by David Megginson // NO WARRANTY! This class is in the public domain. -// $Id: Attributes.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: Attributes.java,v 1.10 2012/04/18 17:29:03 nickc Exp $ package org.xml.sax; diff --git a/libjava/classpath/external/sax/org/xml/sax/ContentHandler.java b/libjava/classpath/external/sax/org/xml/sax/ContentHandler.java index f5f439d78c1..6a1e6f1a574 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ContentHandler.java +++ b/libjava/classpath/external/sax/org/xml/sax/ContentHandler.java @@ -2,7 +2,7 @@ // http://www.saxproject.org // Written by David Megginson // NO WARRANTY! This class is in the public domain. -// $Id: ContentHandler.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: ContentHandler.java,v 1.10 2012/04/18 17:29:03 nickc Exp $ package org.xml.sax; diff --git a/libjava/classpath/external/sax/org/xml/sax/DTDHandler.java b/libjava/classpath/external/sax/org/xml/sax/DTDHandler.java index 67f5bd6a3a4..abaa57606c8 100644 --- a/libjava/classpath/external/sax/org/xml/sax/DTDHandler.java +++ b/libjava/classpath/external/sax/org/xml/sax/DTDHandler.java @@ -1,7 +1,7 @@ // SAX DTD handler. // http://www.saxproject.org // No warranty; no copyright -- use this as you will. -// $Id: DTDHandler.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: DTDHandler.java,v 1.10 2012/04/18 17:29:03 nickc Exp $ package org.xml.sax; diff --git a/libjava/classpath/external/sax/org/xml/sax/DocumentHandler.java b/libjava/classpath/external/sax/org/xml/sax/DocumentHandler.java index 339a0ea657a..6e73c38ab13 100644 --- a/libjava/classpath/external/sax/org/xml/sax/DocumentHandler.java +++ b/libjava/classpath/external/sax/org/xml/sax/DocumentHandler.java @@ -1,7 +1,7 @@ // SAX document handler. // http://www.saxproject.org // No warranty; no copyright -- use this as you will. -// $Id: DocumentHandler.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: DocumentHandler.java,v 1.10 2012/04/18 17:29:03 nickc Exp $ package org.xml.sax; diff --git a/libjava/classpath/external/sax/org/xml/sax/EntityResolver.java b/libjava/classpath/external/sax/org/xml/sax/EntityResolver.java index f1953d5ba0e..88d522f36ac 100644 --- a/libjava/classpath/external/sax/org/xml/sax/EntityResolver.java +++ b/libjava/classpath/external/sax/org/xml/sax/EntityResolver.java @@ -1,7 +1,7 @@ // SAX entity resolver. // http://www.saxproject.org // No warranty; no copyright -- use this as you will. -// $Id: EntityResolver.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: EntityResolver.java,v 1.10 2012/04/18 17:29:03 nickc Exp $ package org.xml.sax; diff --git a/libjava/classpath/external/sax/org/xml/sax/ErrorHandler.java b/libjava/classpath/external/sax/org/xml/sax/ErrorHandler.java index b315ec06d39..1424999d749 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ErrorHandler.java +++ b/libjava/classpath/external/sax/org/xml/sax/ErrorHandler.java @@ -1,7 +1,7 @@ // SAX error handler. // http://www.saxproject.org // No warranty; no copyright -- use this as you will. -// $Id: ErrorHandler.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: ErrorHandler.java,v 1.10 2012/04/18 17:29:03 nickc Exp $ package org.xml.sax; diff --git a/libjava/classpath/external/sax/org/xml/sax/HandlerBase.java b/libjava/classpath/external/sax/org/xml/sax/HandlerBase.java index da27249fd50..7dbde47bc7d 100644 --- a/libjava/classpath/external/sax/org/xml/sax/HandlerBase.java +++ b/libjava/classpath/external/sax/org/xml/sax/HandlerBase.java @@ -1,7 +1,7 @@ // SAX default handler base class. // http://www.saxproject.org // No warranty; no copyright -- use this as you will. -// $Id: HandlerBase.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: HandlerBase.java,v 1.10 2012/04/18 17:29:03 nickc Exp $ package org.xml.sax; diff --git a/libjava/classpath/external/sax/org/xml/sax/InputSource.java b/libjava/classpath/external/sax/org/xml/sax/InputSource.java index b5474921c3e..02373974644 100644 --- a/libjava/classpath/external/sax/org/xml/sax/InputSource.java +++ b/libjava/classpath/external/sax/org/xml/sax/InputSource.java @@ -1,7 +1,7 @@ // SAX input source. // http://www.saxproject.org // No warranty; no copyright -- use this as you will. -// $Id: InputSource.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: InputSource.java,v 1.10 2012/04/18 17:29:03 nickc Exp $ package org.xml.sax; diff --git a/libjava/classpath/external/sax/org/xml/sax/Locator.java b/libjava/classpath/external/sax/org/xml/sax/Locator.java index 910f0d294fa..19006dcbab4 100644 --- a/libjava/classpath/external/sax/org/xml/sax/Locator.java +++ b/libjava/classpath/external/sax/org/xml/sax/Locator.java @@ -1,7 +1,7 @@ // SAX locator interface for document events. // http://www.saxproject.org // No warranty; no copyright -- use this as you will. -// $Id: Locator.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: Locator.java,v 1.10 2012/04/18 17:29:03 nickc Exp $ package org.xml.sax; diff --git a/libjava/classpath/external/sax/org/xml/sax/Parser.java b/libjava/classpath/external/sax/org/xml/sax/Parser.java index 994648897ba..e9dddc9e0e3 100644 --- a/libjava/classpath/external/sax/org/xml/sax/Parser.java +++ b/libjava/classpath/external/sax/org/xml/sax/Parser.java @@ -1,7 +1,7 @@ // SAX parser interface. // http://www.saxproject.org // No warranty; no copyright -- use this as you will. -// $Id: Parser.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: Parser.java,v 1.10 2012/04/18 17:29:03 nickc Exp $ package org.xml.sax; diff --git a/libjava/classpath/external/sax/org/xml/sax/SAXException.java b/libjava/classpath/external/sax/org/xml/sax/SAXException.java index f8691bc575e..fba91dd74bf 100644 --- a/libjava/classpath/external/sax/org/xml/sax/SAXException.java +++ b/libjava/classpath/external/sax/org/xml/sax/SAXException.java @@ -1,7 +1,7 @@ // SAX exception class. // http://www.saxproject.org // No warranty; no copyright -- use this as you will. -// $Id: SAXException.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: SAXException.java,v 1.10 2012/04/18 17:29:03 nickc Exp $ package org.xml.sax; diff --git a/libjava/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java b/libjava/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java index b512288ec74..7522135e8ba 100644 --- a/libjava/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java +++ b/libjava/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java @@ -2,7 +2,7 @@ // http://www.saxproject.org // Written by David Megginson // NO WARRANTY! This class is in the Public Domain. -// $Id: SAXNotRecognizedException.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: SAXNotRecognizedException.java,v 1.10 2012/04/18 17:29:03 nickc Exp $ package org.xml.sax; diff --git a/libjava/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java b/libjava/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java index e59fd40e0f2..b4815f7ffb8 100644 --- a/libjava/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java +++ b/libjava/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java @@ -2,7 +2,7 @@ // http://www.saxproject.org // Written by David Megginson // NO WARRANTY! This class is in the Public Domain. -// $Id: SAXNotSupportedException.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: SAXNotSupportedException.java,v 1.10 2012/04/18 17:29:03 nickc Exp $ package org.xml.sax; diff --git a/libjava/classpath/external/sax/org/xml/sax/SAXParseException.java b/libjava/classpath/external/sax/org/xml/sax/SAXParseException.java index 0921be76241..53bfcb50390 100644 --- a/libjava/classpath/external/sax/org/xml/sax/SAXParseException.java +++ b/libjava/classpath/external/sax/org/xml/sax/SAXParseException.java @@ -1,7 +1,7 @@ // SAX exception class. // http://www.saxproject.org // No warranty; no copyright -- use this as you will. -// $Id: SAXParseException.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: SAXParseException.java,v 1.10 2012/04/18 17:29:03 nickc Exp $ package org.xml.sax; diff --git a/libjava/classpath/external/sax/org/xml/sax/XMLFilter.java b/libjava/classpath/external/sax/org/xml/sax/XMLFilter.java index 363328e2d55..51c58b9c3b0 100644 --- a/libjava/classpath/external/sax/org/xml/sax/XMLFilter.java +++ b/libjava/classpath/external/sax/org/xml/sax/XMLFilter.java @@ -2,7 +2,7 @@ // http://www.saxproject.org // Written by David Megginson // NO WARRANTY! This class is in the Public Domain. -// $Id: XMLFilter.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: XMLFilter.java,v 1.10 2012/04/18 17:29:03 nickc Exp $ package org.xml.sax; diff --git a/libjava/classpath/external/sax/org/xml/sax/XMLReader.java b/libjava/classpath/external/sax/org/xml/sax/XMLReader.java index d334f03fbfd..3cdefd3953c 100644 --- a/libjava/classpath/external/sax/org/xml/sax/XMLReader.java +++ b/libjava/classpath/external/sax/org/xml/sax/XMLReader.java @@ -2,7 +2,7 @@ // http://www.saxproject.org // Written by David Megginson // NO WARRANTY! This class is in the Public Domain. -// $Id: XMLReader.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: XMLReader.java,v 1.10 2012/04/18 17:29:04 nickc Exp $ package org.xml.sax; diff --git a/libjava/classpath/external/sax/org/xml/sax/ext/Attributes2.java b/libjava/classpath/external/sax/org/xml/sax/ext/Attributes2.java index a814d9de31b..792c1c99cf8 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ext/Attributes2.java +++ b/libjava/classpath/external/sax/org/xml/sax/ext/Attributes2.java @@ -1,7 +1,7 @@ // Attributes2.java - extended Attributes // http://www.saxproject.org // Public Domain: no warranty. -// $Id: Attributes2.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: Attributes2.java,v 1.10 2012/04/18 17:29:04 nickc Exp $ package org.xml.sax.ext; diff --git a/libjava/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java b/libjava/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java index 08225593307..711f6c6835b 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java +++ b/libjava/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java @@ -1,7 +1,7 @@ // Attributes2Impl.java - extended AttributesImpl // http://www.saxproject.org // Public Domain: no warranty. -// $Id: Attributes2Impl.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: Attributes2Impl.java,v 1.10 2012/04/18 17:29:04 nickc Exp $ package org.xml.sax.ext; diff --git a/libjava/classpath/external/sax/org/xml/sax/ext/DeclHandler.java b/libjava/classpath/external/sax/org/xml/sax/ext/DeclHandler.java index 42d92269f6f..bacea001e57 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ext/DeclHandler.java +++ b/libjava/classpath/external/sax/org/xml/sax/ext/DeclHandler.java @@ -1,7 +1,7 @@ // DeclHandler.java - Optional handler for DTD declaration events. // http://www.saxproject.org // Public Domain: no warranty. -// $Id: DeclHandler.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: DeclHandler.java,v 1.10 2012/04/18 17:29:04 nickc Exp $ package org.xml.sax.ext; diff --git a/libjava/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java b/libjava/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java index bf47ea889df..46e5d01419e 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java +++ b/libjava/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java @@ -1,7 +1,7 @@ // DefaultHandler2.java - extended DefaultHandler // http://www.saxproject.org // Public Domain: no warranty. -// $Id: DefaultHandler2.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: DefaultHandler2.java,v 1.10 2012/04/18 17:29:04 nickc Exp $ package org.xml.sax.ext; diff --git a/libjava/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java b/libjava/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java index 96dcf6779b7..8f8ce0226c0 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java +++ b/libjava/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java @@ -1,7 +1,7 @@ // EntityResolver2.java - Extended SAX entity resolver. // http://www.saxproject.org // No warranty; no copyright -- use this as you will. -// $Id: EntityResolver2.java,v 1.2 2006/12/10 20:25:41 gnu_andrew Exp $ +// $Id: EntityResolver2.java,v 1.10 2012/04/18 17:29:04 nickc Exp $ package org.xml.sax.ext; diff --git a/libjava/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java b/libjava/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java index 376d1c8d005..94b5bf9927a 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java +++ b/libjava/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java @@ -1,7 +1,7 @@ // LexicalHandler.java - optional handler for lexical parse events. // http://www.saxproject.org // Public Domain: no warranty. -// $Id: LexicalHandler.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: LexicalHandler.java,v 1.10 2012/04/18 17:29:04 nickc Exp $ package org.xml.sax.ext; diff --git a/libjava/classpath/external/sax/org/xml/sax/ext/Locator2.java b/libjava/classpath/external/sax/org/xml/sax/ext/Locator2.java index b186d3a282c..48cf1e01c10 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ext/Locator2.java +++ b/libjava/classpath/external/sax/org/xml/sax/ext/Locator2.java @@ -1,7 +1,7 @@ // Locator2.java - extended Locator // http://www.saxproject.org // Public Domain: no warranty. -// $Id: Locator2.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: Locator2.java,v 1.10 2012/04/18 17:29:04 nickc Exp $ package org.xml.sax.ext; diff --git a/libjava/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java b/libjava/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java index d3c7511144f..1e0492e509d 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java +++ b/libjava/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java @@ -1,7 +1,7 @@ // Locator2Impl.java - extended LocatorImpl // http://www.saxproject.org // Public Domain: no warranty. -// $Id: Locator2Impl.java,v 1.2 2006/12/10 20:25:41 gnu_andrew Exp $ +// $Id: Locator2Impl.java,v 1.10 2012/04/18 17:29:04 nickc Exp $ package org.xml.sax.ext; diff --git a/libjava/classpath/external/sax/org/xml/sax/ext/package.html b/libjava/classpath/external/sax/org/xml/sax/ext/package.html index 0b744800108..fecbf413a0c 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ext/package.html +++ b/libjava/classpath/external/sax/org/xml/sax/ext/package.html @@ -1,5 +1,5 @@ <HTML><HEAD> -<!-- $Id: package.html,v 1.1 2004/12/23 22:38:42 mark Exp $ --> +<!-- $Id: package.html,v 1.10 2012/04/18 17:29:04 nickc Exp $ --> </HEAD><BODY> <p> diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java b/libjava/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java index decf3abc199..6a8b8317abb 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java @@ -1,7 +1,7 @@ // SAX default implementation for AttributeList. // http://www.saxproject.org // No warranty; no copyright -- use this as you will. -// $Id: AttributeListImpl.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: AttributeListImpl.java,v 1.10 2012/04/18 17:29:04 nickc Exp $ package org.xml.sax.helpers; diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java b/libjava/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java index 589b9209fae..e2d006eab54 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java @@ -2,7 +2,7 @@ // http://www.saxproject.org // Written by David Megginson // NO WARRANTY! This class is in the public domain. -// $Id: AttributesImpl.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: AttributesImpl.java,v 1.10 2012/04/18 17:29:04 nickc Exp $ package org.xml.sax.helpers; diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java b/libjava/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java index f3d6eae44c6..7710476f30c 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java @@ -2,7 +2,7 @@ // http://www.saxproject.org // Written by David Megginson // NO WARRANTY! This class is in the public domain. -// $Id: DefaultHandler.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: DefaultHandler.java,v 1.10 2012/04/18 17:29:04 nickc Exp $ package org.xml.sax.helpers; diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java b/libjava/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java index d45813e5b00..02d49944daf 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java @@ -1,7 +1,7 @@ // SAX default implementation for Locator. // http://www.saxproject.org // No warranty; no copyright -- use this as you will. -// $Id: LocatorImpl.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: LocatorImpl.java,v 1.10 2012/04/18 17:29:04 nickc Exp $ package org.xml.sax.helpers; diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java b/libjava/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java index d1e74639ac4..9e3e26b0a1f 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java @@ -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.10 2012/04/18 17:29:04 nickc Exp $ package org.xml.sax.helpers; diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/NewInstance.java b/libjava/classpath/external/sax/org/xml/sax/helpers/NewInstance.java index 211f47f1c0b..8977f7cda95 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/NewInstance.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/NewInstance.java @@ -3,7 +3,7 @@ // Written by Edwin Goei, edwingo@apache.org // and by David Brownell, dbrownell@users.sourceforge.net // NO WARRANTY! This class is in the Public Domain. -// $Id: NewInstance.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: NewInstance.java,v 1.10 2012/04/18 17:29:05 nickc Exp $ package org.xml.sax.helpers; diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java b/libjava/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java index cc0695d2727..132d1ac6a22 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java @@ -2,7 +2,7 @@ // http://www.saxproject.org // Written by David Megginson // NO WARRANTY! This class is in the public domain. -// $Id: ParserAdapter.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: ParserAdapter.java,v 1.10 2012/04/18 17:29:05 nickc Exp $ package org.xml.sax.helpers; diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java b/libjava/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java index ec822b540cc..85a13be170f 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java @@ -1,7 +1,7 @@ // SAX parser factory. // http://www.saxproject.org // No warranty; no copyright -- use this as you will. -// $Id: ParserFactory.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: ParserFactory.java,v 1.10 2012/04/18 17:29:05 nickc Exp $ package org.xml.sax.helpers; diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java b/libjava/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java index 4b4aba092b3..9c5deadd2f7 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java @@ -2,7 +2,7 @@ // http://www.saxproject.org // Written by David Megginson // NO WARRANTY! This class is in the Public Domain. -// $Id: XMLFilterImpl.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: XMLFilterImpl.java,v 1.10 2012/04/18 17:29:05 nickc Exp $ package org.xml.sax.helpers; diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java b/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java index 8ab909a7754..4f3f3fa90c8 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java @@ -2,7 +2,7 @@ // http://www.saxproject.org // Written by David Megginson // NO WARRANTY! This class is in the public domain. -// $Id: XMLReaderAdapter.java,v 1.2 2006/12/10 20:25:41 gnu_andrew Exp $ +// $Id: XMLReaderAdapter.java,v 1.10 2012/04/18 17:29:05 nickc Exp $ package org.xml.sax.helpers; diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java b/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java index 9a04f9b0dda..5dddd8adeed 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java @@ -3,7 +3,7 @@ // Written by David Megginson // and by David Brownell // NO WARRANTY! This class is in the Public Domain. -// $Id: XMLReaderFactory.java,v 1.1 2004/12/23 22:38:42 mark Exp $ +// $Id: XMLReaderFactory.java,v 1.10 2012/04/18 17:29:05 nickc Exp $ package org.xml.sax.helpers; import java.io.BufferedReader; diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/package.html b/libjava/classpath/external/sax/org/xml/sax/helpers/package.html index 06d4a30a63c..9050e4bb585 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/package.html +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/package.html @@ -1,5 +1,5 @@ <HTML><HEAD> -<!-- $Id: package.html,v 1.1 2004/12/23 22:38:42 mark Exp $ --> +<!-- $Id: package.html,v 1.10 2012/04/18 17:29:05 nickc Exp $ --> </HEAD><BODY> <p>This package contains "helper" classes, including diff --git a/libjava/classpath/external/sax/org/xml/sax/package.html b/libjava/classpath/external/sax/org/xml/sax/package.html index b71f67fdda7..cffa5749779 100644 --- a/libjava/classpath/external/sax/org/xml/sax/package.html +++ b/libjava/classpath/external/sax/org/xml/sax/package.html @@ -1,5 +1,5 @@ <html><head> -<!-- $Id: package.html,v 1.1 2004/12/23 22:38:42 mark Exp $ --> +<!-- $Id: package.html,v 1.10 2012/04/18 17:29:04 nickc Exp $ --> </head><body> <p> This package provides the core SAX APIs. diff --git a/libjava/classpath/lib/javax/swing/undo/StateEdit.class b/libjava/classpath/lib/javax/swing/undo/StateEdit.class Binary files differindex c5c079cee89..a83bcfb8b6d 100644 --- a/libjava/classpath/lib/javax/swing/undo/StateEdit.class +++ b/libjava/classpath/lib/javax/swing/undo/StateEdit.class diff --git a/libjava/classpath/lib/javax/swing/undo/StateEditable.class b/libjava/classpath/lib/javax/swing/undo/StateEditable.class Binary files differindex fd5180f7de1..c18ab51d3d6 100644 --- a/libjava/classpath/lib/javax/swing/undo/StateEditable.class +++ b/libjava/classpath/lib/javax/swing/undo/StateEditable.class diff --git a/libjava/classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties b/libjava/classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties index f43bb6f8378..12d7ae5850f 100644 --- a/libjava/classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties +++ b/libjava/classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties @@ -1,5 +1,5 @@ # Localized error messages for gnu.regexp, in Italian. -# $Id: MessagesBundle_it.properties,v 1.2 2006/12/10 20:25:50 gnu_andrew Exp $ +# $Id: MessagesBundle_it.properties,v 1.8 2012/04/18 17:29:06 nickc Exp $ # Messaggi italiani per gnu.regexp. # # Attenzione: Questa traduzione fu scritto da un italo-americano. diff --git a/libjava/classpath/scripts/classpath.spec.in b/libjava/classpath/scripts/classpath.spec.in index 4120d25507c..5e8d9950188 100644 --- a/libjava/classpath/scripts/classpath.spec.in +++ b/libjava/classpath/scripts/classpath.spec.in @@ -1,4 +1,4 @@ -# $Id: classpath.spec.in,v 1.3 2006/12/10 20:25:50 gnu_andrew Exp $ +# $Id: classpath.spec.in,v 1.10 2012/04/18 17:29:06 nickc Exp $ %define version_num @PACKAGE_VERSION@ %define release_num 1 diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/dbcentx.mod b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/dbcentx.mod index 144d38deac4..b039c5dd407 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/dbcentx.mod +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/dbcentx.mod @@ -7,7 +7,7 @@ Corporation, Norman Walsh, and the Organization for the Advancement of Structured Information Standards (OASIS). - $Id: dbcentx.mod,v 1.1 2008/05/27 19:26:05 jsumali Exp $ + $Id: dbcentx.mod,v 1.5 2012/04/18 17:29:07 nickc Exp $ Permission to use, copy, modify and distribute the DocBook XML DTD and its accompanying documentation for any purpose and without fee diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsa.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsa.ent index c03b1c91e9c..02be8231d72 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsa.ent +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsa.ent @@ -5,7 +5,7 @@ <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured Information Standards (OASIS). - $Id: iso-amsa.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $ + $Id: iso-amsa.ent,v 1.5 2012/04/18 17:29:07 nickc Exp $ Permission to use, copy, modify and distribute this entity set and its accompanying documentation for any purpose and without diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsb.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsb.ent index 945d7eef431..4e7e6c2f298 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsb.ent +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsb.ent @@ -5,7 +5,7 @@ <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured Information Standards (OASIS). - $Id: iso-amsb.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $ + $Id: iso-amsb.ent,v 1.5 2012/04/18 17:29:07 nickc Exp $ Permission to use, copy, modify and distribute this entity set and its accompanying documentation for any purpose and without diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsc.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsc.ent index 604ac480c67..1cb8cb4359a 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsc.ent +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsc.ent @@ -5,7 +5,7 @@ <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured Information Standards (OASIS). - $Id: iso-amsc.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $ + $Id: iso-amsc.ent,v 1.5 2012/04/18 17:29:07 nickc Exp $ Permission to use, copy, modify and distribute this entity set and its accompanying documentation for any purpose and without diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsn.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsn.ent index fbc1e94e145..60e281d66e7 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsn.ent +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsn.ent @@ -5,7 +5,7 @@ <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured Information Standards (OASIS). - $Id: iso-amsn.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $ + $Id: iso-amsn.ent,v 1.5 2012/04/18 17:29:07 nickc Exp $ Permission to use, copy, modify and distribute this entity set and its accompanying documentation for any purpose and without diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amso.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amso.ent index 6dc68108f0c..ac36020566a 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amso.ent +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amso.ent @@ -5,7 +5,7 @@ <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured Information Standards (OASIS). - $Id: iso-amso.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $ + $Id: iso-amso.ent,v 1.5 2012/04/18 17:29:07 nickc Exp $ Permission to use, copy, modify and distribute this entity set and its accompanying documentation for any purpose and without diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsr.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsr.ent index 9c370b3ad4d..5e004ba75e8 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsr.ent +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsr.ent @@ -5,7 +5,7 @@ <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured Information Standards (OASIS). - $Id: iso-amsr.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $ + $Id: iso-amsr.ent,v 1.5 2012/04/18 17:29:07 nickc Exp $ Permission to use, copy, modify and distribute this entity set and its accompanying documentation for any purpose and without diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-box.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-box.ent index 904916c908f..ae7fc698ce3 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-box.ent +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-box.ent @@ -5,7 +5,7 @@ <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured Information Standards (OASIS). - $Id: iso-box.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $ + $Id: iso-box.ent,v 1.5 2012/04/18 17:29:07 nickc Exp $ Permission to use, copy, modify and distribute this entity set and its accompanying documentation for any purpose and without diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr1.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr1.ent index 6507c79cb5f..529884ffb5e 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr1.ent +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr1.ent @@ -5,7 +5,7 @@ <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured Information Standards (OASIS). - $Id: iso-cyr1.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $ + $Id: iso-cyr1.ent,v 1.5 2012/04/18 17:29:07 nickc Exp $ Permission to use, copy, modify and distribute this entity set and its accompanying documentation for any purpose and without diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr2.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr2.ent index 50f534749a4..cba77003b1d 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr2.ent +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr2.ent @@ -5,7 +5,7 @@ <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured Information Standards (OASIS). - $Id: iso-cyr2.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $ + $Id: iso-cyr2.ent,v 1.5 2012/04/18 17:29:07 nickc Exp $ Permission to use, copy, modify and distribute this entity set and its accompanying documentation for any purpose and without diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-dia.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-dia.ent index 278e5d9e08f..9dcee56a9ba 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-dia.ent +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-dia.ent @@ -5,7 +5,7 @@ <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured Information Standards (OASIS). - $Id: iso-dia.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $ + $Id: iso-dia.ent,v 1.5 2012/04/18 17:29:07 nickc Exp $ Permission to use, copy, modify and distribute this entity set and its accompanying documentation for any purpose and without diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk1.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk1.ent index 848f203d079..44b6b42d8f3 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk1.ent +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk1.ent @@ -5,7 +5,7 @@ <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured Information Standards (OASIS). - $Id: iso-grk1.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $ + $Id: iso-grk1.ent,v 1.5 2012/04/18 17:29:07 nickc Exp $ Permission to use, copy, modify and distribute this entity set and its accompanying documentation for any purpose and without diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk2.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk2.ent index a75f5b04abb..31bae306ff1 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk2.ent +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk2.ent @@ -5,7 +5,7 @@ <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured Information Standards (OASIS). - $Id: iso-grk2.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $ + $Id: iso-grk2.ent,v 1.5 2012/04/18 17:29:07 nickc Exp $ Permission to use, copy, modify and distribute this entity set and its accompanying documentation for any purpose and without diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk3.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk3.ent index 070ef252ca4..65f692b13fe 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk3.ent +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk3.ent @@ -5,7 +5,7 @@ <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured Information Standards (OASIS). - $Id: iso-grk3.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $ + $Id: iso-grk3.ent,v 1.5 2012/04/18 17:29:07 nickc Exp $ Permission to use, copy, modify and distribute this entity set and its accompanying documentation for any purpose and without diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk4.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk4.ent index 18c96eb49f6..2c364e31931 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk4.ent +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk4.ent @@ -5,7 +5,7 @@ <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured Information Standards (OASIS). - $Id: iso-grk4.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $ + $Id: iso-grk4.ent,v 1.5 2012/04/18 17:29:07 nickc Exp $ Permission to use, copy, modify and distribute this entity set and its accompanying documentation for any purpose and without diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat1.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat1.ent index 9c2c24932f3..c98b6b6c495 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat1.ent +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat1.ent @@ -5,7 +5,7 @@ <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured Information Standards (OASIS). - $Id: iso-lat1.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $ + $Id: iso-lat1.ent,v 1.5 2012/04/18 17:29:07 nickc Exp $ Permission to use, copy, modify and distribute this entity set and its accompanying documentation for any purpose and without diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat2.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat2.ent index 2f146967cc4..88c8cd02197 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat2.ent +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat2.ent @@ -5,7 +5,7 @@ <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured Information Standards (OASIS). - $Id: iso-lat2.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $ + $Id: iso-lat2.ent,v 1.5 2012/04/18 17:29:07 nickc Exp $ Permission to use, copy, modify and distribute this entity set and its accompanying documentation for any purpose and without diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-num.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-num.ent index b3c434e30d1..90e8fba3941 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-num.ent +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-num.ent @@ -5,7 +5,7 @@ <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured Information Standards (OASIS). - $Id: iso-num.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $ + $Id: iso-num.ent,v 1.5 2012/04/18 17:29:08 nickc Exp $ Permission to use, copy, modify and distribute this entity set and its accompanying documentation for any purpose and without diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-pub.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-pub.ent index 979d178a49d..9c931aa2a9f 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-pub.ent +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-pub.ent @@ -5,7 +5,7 @@ <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured Information Standards (OASIS). - $Id: iso-pub.ent,v 1.1 2008/05/27 19:26:08 jsumali Exp $ + $Id: iso-pub.ent,v 1.5 2012/04/18 17:29:08 nickc Exp $ Permission to use, copy, modify and distribute this entity set and its accompanying documentation for any purpose and without diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-tech.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-tech.ent index b0aaac49c28..41555419bcd 100644 --- a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-tech.ent +++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-tech.ent @@ -5,7 +5,7 @@ <!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured Information Standards (OASIS). - $Id: iso-tech.ent,v 1.1 2008/05/27 19:26:08 jsumali Exp $ + $Id: iso-tech.ent,v 1.5 2012/04/18 17:29:08 nickc Exp $ Permission to use, copy, modify and distribute this entity set and its accompanying documentation for any purpose and without diff --git a/libjava/configure b/libjava/configure index b0b45bb26af..b3c47348ec6 100755 --- a/libjava/configure +++ b/libjava/configure @@ -11573,7 +11573,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) + freebsd2*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -12489,7 +12489,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[23].*) objformat=aout ;; + freebsd[123]*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -12507,7 +12507,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2.*) + freebsd2*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -14397,7 +14397,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac ;; - freebsd2.*) + freebsd[12]*) # C++ shared libraries reported to be fairly broken before # switch to ELF ld_shlibs_CXX=no @@ -16172,7 +16172,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[23].*) objformat=aout ;; + freebsd[123]*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -16190,7 +16190,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2.*) + freebsd2*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -18533,7 +18533,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) + freebsd2*) archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct_GCJ=yes hardcode_minus_L_GCJ=yes diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index 3951e358907..1bd9416caa7 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -290,7 +290,6 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ extra_ldflags = @extra_ldflags@ extra_ldflags_libjava = @extra_ldflags_libjava@ -gcc_suffix = @gcc_suffix@ gcjsubdir = @gcjsubdir@ gxx_include_dir = @gxx_include_dir@ here = @here@ @@ -604,14 +603,13 @@ uninstall-am: uninstall-gcjHEADERS uninstall-toolgcjHEADERS clean-libtool ctags distclean distclean-generic distclean-hdr \ distclean-libtool distclean-tags dvi dvi-am html html-am info \ info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-gcjHEADERS install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip install-toolgcjHEADERS \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-gcjHEADERS uninstall-toolgcjHEADERS + install-exec install-exec-am install-gcjHEADERS install-info \ + install-info-am install-man install-strip \ + install-toolgcjHEADERS installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-gcjHEADERS \ + uninstall-info-am uninstall-toolgcjHEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index 34f4ad03178..683d00da8e1 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -291,7 +291,6 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ extra_ldflags = @extra_ldflags@ extra_ldflags_libjava = @extra_ldflags_libjava@ -gcc_suffix = @gcc_suffix@ gcjsubdir = @gcjsubdir@ gxx_include_dir = @gxx_include_dir@ here = @here@ @@ -584,14 +583,12 @@ uninstall-am: uninstall-tool_include_HEADERS clean-libtool ctags distclean distclean-generic distclean-hdr \ distclean-libtool distclean-tags dvi dvi-am html html-am info \ info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip install-tool_include_HEADERS \ + install-exec install-exec-am install-info install-info-am \ + install-man install-strip install-tool_include_HEADERS \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-tool_include_HEADERS + uninstall-am uninstall-info-am uninstall-tool_include_HEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/libjava/interpret-run.cc b/libjava/interpret-run.cc index a4c2d4dab43..3aa072d52fd 100644 --- a/libjava/interpret-run.cc +++ b/libjava/interpret-run.cc @@ -396,23 +396,23 @@ details. */ #undef NEXT_INSN #define NEXT_INSN goto *((pc++)->insn) +// REWRITE_INSN does nothing. +// // Rewriting a multi-word instruction in the presence of multiple -// threads is a data race if a thread reads part of an instruction -// while some other thread is rewriting that instruction. We detect -// more than one thread executing a method and don't rewrite the -// instruction. A thread entering a method blocks on -// rewrite_insn_mutex until the write is complete. -#define REWRITE_INSN(INSN,SLOT,VALUE) \ - do { \ - _Jv_MutexLock (&rewrite_insn_mutex); \ - if (meth->thread_count <= 1) \ - { \ - pc[-2].insn = INSN; \ - pc[-1].SLOT = VALUE; \ - } \ - _Jv_MutexUnlock (&rewrite_insn_mutex); \ - } \ - while (0) +// threads leads to a data race if a thread reads part of an +// instruction while some other thread is rewriting that instruction. +// For example, an invokespecial instruction may be rewritten to +// invokespecial_resolved and its operand changed from an index to a +// pointer while another thread is executing invokespecial. This +// other thread then reads the pointer that is now the operand of +// invokespecial_resolved and tries to use it as an index. +// +// Fixing this requires either spinlocks, a more elaborate data +// structure, or even per-thread allocated pages. It's clear from the +// locking in meth->compile below that the presence of multiple +// threads was contemplated when this code was written, but the full +// consequences were not fully appreciated. +#define REWRITE_INSN(INSN,SLOT,VALUE) #undef INTERP_REPORT_EXCEPTION #define INTERP_REPORT_EXCEPTION(Jthrowable) /* not needed when not debugging */ diff --git a/libjava/java/lang/natThread.cc b/libjava/java/lang/natThread.cc index d6abff13f54..9d51b1b767e 100644 --- a/libjava/java/lang/natThread.cc +++ b/libjava/java/lang/natThread.cc @@ -429,7 +429,7 @@ java::lang::Thread::yield (void) ::java::lang::Thread$State * java::lang::Thread::getState() { - _Jv_InitClass(&::java::lang::Thread$State::class$); + _Jv_InitClass(&::java::lang::Thread$State: Exp $); switch (state) { diff --git a/libjava/libgcj_bc.c b/libjava/libgcj_bc.c index 67f00aebfb0..369bcb44200 100644 --- a/libjava/libgcj_bc.c +++ b/libjava/libgcj_bc.c @@ -89,8 +89,6 @@ void _Jv_AttachCurrentThreadAsDaemon () {} void _Jv_CreateJavaVM () {} void _Jv_DetachCurrentThread () {} void _Jv_Free () {} -void _Jv_GetStringUTFLength () {} -void _Jv_GetStringUTFRegion () {} void _Jv_Malloc () {} void _Jv_NewString () {} void _Jv_NewStringLatin1 () {} diff --git a/libjava/libltdl/ChangeLog b/libjava/libltdl/ChangeLog index cbb8598f27f..e737681aee0 100644 --- a/libjava/libltdl/ChangeLog +++ b/libjava/libltdl/ChangeLog @@ -1,7 +1,3 @@ -2012-06-14 Release Manager - - * GCC 4.7.1 released. - 2012-03-22 Release Manager * GCC 4.7.0 released. diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in index 28c4630cf44..50156eef289 100644 --- a/libjava/testsuite/Makefile.in +++ b/libjava/testsuite/Makefile.in @@ -266,7 +266,6 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ extra_ldflags = @extra_ldflags@ extra_ldflags_libjava = @extra_ldflags_libjava@ -gcc_suffix = @gcc_suffix@ gcjsubdir = @gcjsubdir@ gxx_include_dir = @gxx_include_dir@ here = @here@ @@ -499,10 +498,8 @@ uninstall-am: .PHONY: all all-am check check-DEJAGNU check-am clean clean-generic \ clean-libtool distclean distclean-DEJAGNU distclean-generic \ distclean-libtool dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ + 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |