aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog2
-rw-r--r--libjava/java/lang/System.java5
2 files changed, 7 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 342f95f..9fadfce 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,7 @@
2003-09-23 Nathanael Nerode <neroden@gcc.gnu.org>
+ * java/lang/System.java: Add GCJ LOCAL note about encoding aliases.
+
* java/lang/Float.java, java/lang/Double.java: Add GCJ LOCAL
markers.
diff --git a/libjava/java/lang/System.java b/libjava/java/lang/System.java
index 1d27dfc..6388104 100644
--- a/libjava/java/lang/System.java
+++ b/libjava/java/lang/System.java
@@ -99,6 +99,11 @@ public final class System
defaultProperties.put("gnu.cpu.endian",
isWordsBigEndian() ? "big" : "little");
+
+ // GCJ LOCAL: Classpath sets common encoding aliases here.
+ // Since we don't (yet) have gnu.java.io.EncodingManager, these
+ // are a waste of time and just slow down system startup.
+
// XXX FIXME - Temp hack for old systems that set the wrong property
if (defaultProperties.get("java.io.tmpdir") == null)
defaultProperties.put("java.io.tmpdir",