diff options
| author | Tom Tromey <tromey@redhat.com> | 2001-09-04 17:18:20 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2001-09-04 17:18:20 +0000 |
| commit | 9d6466593e9e7c8e241f93c7a158160be9440c39 (patch) | |
| tree | 49129e62eb63cb9825b407dd657bc004b29582b1 /libjava | |
| parent | 9aa5ba9701347926016dcd79a9ecdb7cd547647c (diff) | |
| download | gcc-9d6466593e9e7c8e241f93c7a158160be9440c39.zip gcc-9d6466593e9e7c8e241f93c7a158160be9440c39.tar.gz gcc-9d6466593e9e7c8e241f93c7a158160be9440c39.tar.bz2 | |
re PR libgcj/4213 (SimpleDateFormat constructor SEGV's.)
Fix for PR libgcj/4213:
* Makefile.am (ordinary_java_source_files): Added new file.
* gnu/gcj/text/LocaleData.java: New file.
From-SVN: r45381
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/Makefile.am | 1 | ||||
| -rw-r--r-- | libjava/Makefile.in | 3 | ||||
| -rw-r--r-- | libjava/gnu/gcj/text/LocaleData.java | 25 |
4 files changed, 34 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index aba2dd3..46741e1 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2001-09-04 Tom Tromey <tromey@redhat.com> + + Fix for PR libgcj/4213: + * Makefile.am (ordinary_java_source_files): Added new file. + * gnu/gcj/text/LocaleData.java: New file. + 2001-09-03 Tom Tromey <tromey@redhat.com> * java/lang/reflect/natField.cc (set): Allow for case when the diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 963f631..d80838a 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -1126,6 +1126,7 @@ gnu/gcj/runtime/VMClassLoader.java \ gnu/gcj/text/BaseBreakIterator.java \ gnu/gcj/text/CharacterBreakIterator.java \ gnu/gcj/text/LineBreakIterator.java \ +gnu/gcj/text/LocaleData.java \ gnu/gcj/text/LocaleData_en.java \ gnu/gcj/text/LocaleData_en_US.java \ gnu/gcj/text/SentenceBreakIterator.java \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 334ea77..b888b64 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -876,6 +876,7 @@ gnu/gcj/runtime/VMClassLoader.java \ gnu/gcj/text/BaseBreakIterator.java \ gnu/gcj/text/CharacterBreakIterator.java \ gnu/gcj/text/LineBreakIterator.java \ +gnu/gcj/text/LocaleData.java \ gnu/gcj/text/LocaleData_en.java \ gnu/gcj/text/LocaleData_en_US.java \ gnu/gcj/text/SentenceBreakIterator.java \ @@ -1493,7 +1494,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/gcj/runtime/natFirstThread.P \ .deps/gnu/gcj/text/BaseBreakIterator.P \ .deps/gnu/gcj/text/CharacterBreakIterator.P \ -.deps/gnu/gcj/text/LineBreakIterator.P \ +.deps/gnu/gcj/text/LineBreakIterator.P .deps/gnu/gcj/text/LocaleData.P \ .deps/gnu/gcj/text/LocaleData_en.P \ .deps/gnu/gcj/text/LocaleData_en_US.P \ .deps/gnu/gcj/text/SentenceBreakIterator.P \ diff --git a/libjava/gnu/gcj/text/LocaleData.java b/libjava/gnu/gcj/text/LocaleData.java new file mode 100644 index 0000000..fc273b9 --- /dev/null +++ b/libjava/gnu/gcj/text/LocaleData.java @@ -0,0 +1,25 @@ +// Generic locale data for java.text. + +/* Copyright (C) 2001 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.text; + +import java.util.ListResourceBundle; + +public class LocaleData extends ListResourceBundle +{ + private static final Object[][] contents = + { + }; + + protected Object[][] getContents () + { + return contents; + } +} |