summaryrefslogtreecommitdiffstats
path: root/libjava/java/lang
diff options
context:
space:
mode:
authorgreen <green@138bc75d-0d04-0410-961f-82ee72b054a4>2002-02-07 03:24:12 +0000
committergreen <green@138bc75d-0d04-0410-961f-82ee72b054a4>2002-02-07 03:24:12 +0000
commit2a8dfff3f974ba56056ce7f5ebc5737a6a3f5849 (patch)
tree27d9ff28c3ab0424e26761a6636a9afcbf395114 /libjava/java/lang
parent434f18a9dac1041b7f31ee5f55943de818e96d91 (diff)
downloadppe42-gcc-2a8dfff3f974ba56056ce7f5ebc5737a6a3f5849.tar.gz
ppe42-gcc-2a8dfff3f974ba56056ce7f5ebc5737a6a3f5849.zip
embedded updates
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49562 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/lang')
-rw-r--r--libjava/java/lang/natSystem.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc
index faeff5107a1..5844246b7a9 100644
--- a/libjava/java/lang/natSystem.cc
+++ b/libjava/java/lang/natSystem.cc
@@ -271,7 +271,9 @@ java::lang::System::getSystemTimeZone (void)
tz1 = tzname[0];
tz2 = strcmp (tzname[0], tzname[1]) ? tzname[1] : "";
#else
-#error Neither tm_zone nor tzname defined
+ // Some targets have no concept of timezones.
+ tz1 = "???";
+ tz2 = tz1;
#endif
if ((tzoffset % 3600) == 0)
@@ -464,6 +466,7 @@ java::lang::System::init_properties (void)
}
// Set the system properties from the user's environment.
+#ifndef DISABLE_GETENV_PROPERTIES
if (_Jv_Environment_Properties)
{
size_t i = 0;
@@ -475,6 +478,7 @@ java::lang::System::init_properties (void)
i++;
}
}
+#endif
if (_Jv_Jar_Class_Path)
newprops->put(JvNewStringLatin1 ("java.class.path"),
OpenPOWER on IntegriCloud