diff options
| author | Tom Tromey <tromey@redhat.com> | 2000-12-12 00:32:02 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2000-12-12 00:32:02 +0000 |
| commit | d65b78c9a4a1bbb3e357aa3ae131d3268c9f9bfb (patch) | |
| tree | 4b0780cf6760ac599a3fc7e4eff1a8b9ea2cd352 | |
| parent | 9502066fa8ce534d1bae259adcce241be7228f1a (diff) | |
| download | gcc-d65b78c9a4a1bbb3e357aa3ae131d3268c9f9bfb.zip gcc-d65b78c9a4a1bbb3e357aa3ae131d3268c9f9bfb.tar.gz gcc-d65b78c9a4a1bbb3e357aa3ae131d3268c9f9bfb.tar.bz2 | |
FirstThread.java (Kcert, [...]): New static final fields.
* gnu/gcj/runtime/FirstThread.java (Kcert, Kfile, Khttp, Kjar):
New static final fields.
From-SVN: r38200
| -rw-r--r-- | libjava/ChangeLog | 3 | ||||
| -rw-r--r-- | libjava/gnu/gcj/runtime/FirstThread.java | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7ca34d2..f1e8891 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,8 @@ 2000-12-11 Tom Tromey <tromey@redhat.com> + * gnu/gcj/runtime/FirstThread.java (Kcert, Kfile, Khttp, Kjar): + New static final fields. + * scripts/classes.pl (scan): Skip lines with leading `*'. Fix for PR libgcj/378. diff --git a/libjava/gnu/gcj/runtime/FirstThread.java b/libjava/gnu/gcj/runtime/FirstThread.java index 8cf477f..a928c9c 100644 --- a/libjava/gnu/gcj/runtime/FirstThread.java +++ b/libjava/gnu/gcj/runtime/FirstThread.java @@ -1,6 +1,6 @@ // FirstThread.java - Implementation of very first thread. -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -74,4 +74,13 @@ final class FirstThread extends Thread private Class klass; private String klass_name; private Object args; + + // If the user links statically then we need to ensure that these + // classes are linked in. Otherwise bootstrapping fails. These + // classes are only referred to via Class.forName(), so we add an + // explicit mention of them here. + static final Class Kcert = java.security.cert.Certificate.class; + static final Class Kfile = gnu.gcj.protocol.file.Handler.class; + static final Class Khttp = gnu.gcj.protocol.http.Handler.class; + static final Class Kjar = gnu.gcj.protocol.jar.Handler.class; } |