-diff -rBubboehm-gc/configureboehm-gc/configure
----boehm-gc/configure Tue May 13 17:18:14 2003
-+++boehm-gc/configure Mon Mar 1 01:03:55 2004
+diff -rBub boehm-gc/configureboehm-gc/configure
+--- boehm-gc/configure Tue May 13 17:18:14 2003
++++ boehm-gc/configure Mon Mar 1 01:03:55 2004
@@ -1181,9 +1181,9 @@
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
fi
else
GXX=
-diff -rBubgcc/dwarf2out.cgcc/dwarf2out.c
----gcc/dwarf2out.c Mon May 5 09:59:20 2003
-+++gcc/dwarf2out.c Sat Feb 28 02:37:20 2004
+diff -rBub gcc/dwarf2out.cgcc/dwarf2out.c
+--- gcc/dwarf2out.c Mon May 5 09:59:20 2003
++++ gcc/dwarf2out.c Sat Feb 28 02:37:20 2004
@@ -1040,6 +1040,8 @@
else if (!flag_asynchronous_unwind_tables && cfa.reg != STACK_POINTER_REGNUM)
return;
if (GET_CODE (insn) == BARRIER)
{
/* When we see a BARRIER, we know to reset args_size to 0. Usually
-diff -rBubgcc/java/class.cgcc/java/class.c
----gcc/java/class.c Fri Feb 28 12:53:07 2003
-+++gcc/java/class.c Mon Mar 1 00:20:15 2004
+diff -rBub gcc/java/class.cgcc/java/class.c
+--- gcc/java/class.c Fri Feb 28 12:53:07 2003
++++ gcc/java/class.c Mon Mar 1 00:20:15 2004
@@ -971,7 +971,7 @@
tree type;
{
while (method_list != NULL_TREE)
{
method = TREE_VALUE (method_list);
-diff -rBubgcc/java/constants.cgcc/java/constants.c
----gcc/java/constants.c Mon Nov 18 07:46:32 2002
-+++gcc/java/constants.c Mon Mar 1 00:20:32 2004
+diff -rBub gcc/java/constants.cgcc/java/constants.c
+--- gcc/java/constants.c Mon Nov 18 07:46:32 2002
++++ gcc/java/constants.c Mon Mar 1 00:20:32 2004
@@ -430,9 +430,13 @@
int i;
for (i = outgoing_cpool->count; --i > 0; )
}
else
{
-diff -rBubgcc/java/java-tree.hgcc/java/java-tree.h
----gcc/java/java-tree.h Mon Nov 18 10:13:35 2002
-+++gcc/java/java-tree.h Thu Feb 26 15:01:38 2004
+diff -rBub gcc/java/java-tree.hgcc/java/java-tree.h
+--- gcc/java/java-tree.h Mon Nov 18 10:13:35 2002
++++ gcc/java/java-tree.h Thu Feb 26 15:01:38 2004
@@ -225,6 +225,9 @@
/* Encoding used for source files. */
extern const char *current_encoding;
/* The Java .class file that provides main_class; the main input file. */
extern struct JCF *current_jcf;
-diff -rBubgcc/java/lang.cgcc/java/lang.c
----gcc/java/lang.c Sun Jan 5 07:03:25 2003
-+++gcc/java/lang.c Thu Feb 26 15:01:38 2004
+diff -rBub gcc/java/lang.cgcc/java/lang.c
+--- gcc/java/lang.c Sun Jan 5 07:03:25 2003
++++ gcc/java/lang.c Thu Feb 26 15:01:38 2004
@@ -171,6 +171,9 @@
/* The encoding of the source file. */
const char *current_encoding = NULL;
return 1;
}
#undef ARG
-diff -rBublibjava/Makefile.inlibjava/Makefile.in
----libjava/Makefile.in Mon Mar 1 01:45:58 2004
-+++libjava/Makefile.in Sun Feb 29 22:09:27 2004
+diff -rBub libjava/Makefile.inlibjava/Makefile.in
+--- libjava/Makefile.in Mon Mar 1 01:45:58 2004
++++ libjava/Makefile.in Sun Feb 29 22:09:27 2004
@@ -174,10 +174,10 @@
WARNINGS = -W -Wall
@USING_GCC_TRUE@AM_CFLAGS = @USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS)
@USING_GCC_FALSE@AM_CFLAGS = @USING_GCC_FALSE@@LIBGCJ_CFLAGS@
-diff -rBublibjava/boehm.cclibjava/boehm.cc
----libjava/boehm.cc Thu Jan 2 21:19:53 2003
-+++libjava/boehm.cc Mon Mar 1 00:21:04 2004
+diff -rBub libjava/boehm.cclibjava/boehm.cc
+--- libjava/boehm.cc Thu Jan 2 21:19:53 2003
++++ libjava/boehm.cc Mon Mar 1 00:21:04 2004
@@ -17,6 +17,7 @@
#include <java/lang/Class.h>
while (klass && klass != &java::lang::Object::class$)
{
jfieldID field = JvGetFirstInstanceField (klass);
-diff -rBublibjava/configurelibjava/configure
----libjava/configure Mon Mar 1 01:45:59 2004
-+++libjava/configure Sun Feb 29 22:13:11 2004
+diff -rBub libjava/configurelibjava/configure
+--- libjava/configure Mon Mar 1 01:45:59 2004
++++ libjava/configure Sun Feb 29 22:13:11 2004
@@ -1180,13 +1180,13 @@
CFLAGS="$ac_save_CFLAGS"
elif test $ac_cv_prog_cc_g = yes; then
cat > conftest.$ac_ext <<EOF
#line 5800 "configure"
#include "confdefs.h"
-diff -rBublibjava/configure.inlibjava/configure.in
----libjava/configure.in Mon Mar 1 01:45:59 2004
-+++libjava/configure.in Mon Mar 1 00:28:09 2004
+diff -rBub libjava/configure.inlibjava/configure.in
+--- libjava/configure.in Mon Mar 1 01:45:59 2004
++++ libjava/configure.in Mon Mar 1 00:28:09 2004
@@ -825,7 +825,7 @@
dnl Work around a g++ bug. Reported to gcc-bugs@gcc.gnu.org on Jan 22, 2000.
AC_MSG_CHECKING([for g++ -ffloat-store bug])
AC_TRY_COMPILE([#include <math.h>], ,
[AC_MSG_RESULT(no)],
[AC_DEFINE(__NO_MATH_INLINES)
-diff -rBublibjava/gnu/gcj/convert/BytesToUnicode.javalibjava/gnu/gcj/convert/BytesToUnicode.java
----libjava/gnu/gcj/convert/BytesToUnicode.java Mon Jul 30 13:24:17 2001
-+++libjava/gnu/gcj/convert/BytesToUnicode.java Fri Feb 27 04:17:13 2004
+diff -rBub libjava/gnu/gcj/convert/BytesToUnicode.javalibjava/gnu/gcj/convert/BytesToUnicode.java
+--- libjava/gnu/gcj/convert/BytesToUnicode.java Mon Jul 30 13:24:17 2001
++++ libjava/gnu/gcj/convert/BytesToUnicode.java Fri Feb 27 04:17:13 2004
@@ -65,7 +65,7 @@
}
catch (Throwable ex)
}
}
-diff -rBublibjava/gnu/gcj/convert/IOConverter.javalibjava/gnu/gcj/convert/IOConverter.java
----libjava/gnu/gcj/convert/IOConverter.java Sun Sep 16 19:28:53 2001
-+++libjava/gnu/gcj/convert/IOConverter.java Sun Feb 29 01:53:14 2004
+diff -rBub libjava/gnu/gcj/convert/IOConverter.javalibjava/gnu/gcj/convert/IOConverter.java
+--- libjava/gnu/gcj/convert/IOConverter.java Sun Sep 16 19:28:53 2001
++++ libjava/gnu/gcj/convert/IOConverter.java Sun Feb 29 01:53:14 2004
@@ -20,7 +20,7 @@
// True if we have to do byte-order conversions on iconv()
}
private static native boolean iconv_init ();
-diff -rBublibjava/gnu/gcj/convert/UnicodeToBytes.javalibjava/gnu/gcj/convert/UnicodeToBytes.java
----libjava/gnu/gcj/convert/UnicodeToBytes.java Fri Aug 17 20:56:01 2001
-+++libjava/gnu/gcj/convert/UnicodeToBytes.java Fri Feb 27 04:17:02 2004
+diff -rBub libjava/gnu/gcj/convert/UnicodeToBytes.javalibjava/gnu/gcj/convert/UnicodeToBytes.java
+--- libjava/gnu/gcj/convert/UnicodeToBytes.java Fri Aug 17 20:56:01 2001
++++ libjava/gnu/gcj/convert/UnicodeToBytes.java Fri Feb 27 04:17:02 2004
@@ -63,7 +63,8 @@
}
catch (Throwable ex)
}
}
-diff -rBublibjava/gnu/gcj/runtime/FirstThread.javalibjava/gnu/gcj/runtime/FirstThread.java
----libjava/gnu/gcj/runtime/FirstThread.java Wed Oct 10 15:25:43 2001
-+++libjava/gnu/gcj/runtime/FirstThread.java Fri Feb 27 05:05:29 2004
+diff -rBub libjava/gnu/gcj/runtime/FirstThread.javalibjava/gnu/gcj/runtime/FirstThread.java
+--- libjava/gnu/gcj/runtime/FirstThread.java Wed Oct 10 15:25:43 2001
++++ libjava/gnu/gcj/runtime/FirstThread.java Fri Feb 27 05:05:29 2004
@@ -90,8 +90,10 @@
// classes are linked in. Otherwise bootstrapping fails. These
// classes are only referred to via Class.forName(), so we add an
static final Class Kjar = gnu.gcj.protocol.jar.Handler.class;
+ */
}
-diff -rBublibjava/gnu/gcj/runtime/VMClassLoader.javalibjava/gnu/gcj/runtime/VMClassLoader.java
----libjava/gnu/gcj/runtime/VMClassLoader.java Sun Dec 8 16:03:59 2002
-+++libjava/gnu/gcj/runtime/VMClassLoader.java Fri Feb 27 04:20:56 2004
+diff -rBub libjava/gnu/gcj/runtime/VMClassLoader.javalibjava/gnu/gcj/runtime/VMClassLoader.java
+--- libjava/gnu/gcj/runtime/VMClassLoader.java Sun Dec 8 16:03:59 2002
++++ libjava/gnu/gcj/runtime/VMClassLoader.java Fri Feb 27 04:20:56 2004
@@ -14,13 +14,15 @@
import java.util.StringTokenizer;
import java.net.URL;
/** This is overridden to search the internal hash table, which
* will only search existing linked-in classes. This will make
* the default implementation of loadClass (in ClassLoader) work right.
-diff -rBublibjava/gnu/gcj/runtime/natVMClassLoader.cclibjava/gnu/gcj/runtime/natVMClassLoader.cc
----libjava/gnu/gcj/runtime/natVMClassLoader.cc Tue Dec 10 19:15:14 2002
-+++libjava/gnu/gcj/runtime/natVMClassLoader.cc Fri Feb 27 04:22:00 2004
+diff -rBub libjava/gnu/gcj/runtime/natVMClassLoader.cclibjava/gnu/gcj/runtime/natVMClassLoader.cc
+--- libjava/gnu/gcj/runtime/natVMClassLoader.cc Tue Dec 10 19:15:14 2002
++++ libjava/gnu/gcj/runtime/natVMClassLoader.cc Fri Feb 27 04:22:00 2004
@@ -60,8 +60,9 @@
}
+ */
return klass;
}
-diff -rBublibjava/java/lang/Class.javalibjava/java/lang/Class.java
----libjava/java/lang/Class.java Tue Sep 3 14:33:46 2002
-+++libjava/java/lang/Class.java Sat Feb 28 22:48:09 2004
+diff -rBub libjava/java/lang/Class.javalibjava/java/lang/Class.java
+--- libjava/java/lang/Class.java Tue Sep 3 14:33:46 2002
++++ libjava/java/lang/Class.java Sat Feb 28 22:48:09 2004
@@ -241,6 +241,7 @@
*/
public ProtectionDomain getProtectionDomain()
}
public String toString ()
-diff -rBublibjava/java/lang/ClassLoader.javalibjava/java/lang/ClassLoader.java
----libjava/java/lang/ClassLoader.java Fri Jan 24 11:38:24 2003
-+++libjava/java/lang/ClassLoader.java Sat Feb 28 21:07:31 2004
+diff -rBub libjava/java/lang/ClassLoader.javalibjava/java/lang/ClassLoader.java
+--- libjava/java/lang/ClassLoader.java Fri Jan 24 11:38:24 2003
++++ libjava/java/lang/ClassLoader.java Sat Feb 28 21:07:31 2004
@@ -345,8 +345,8 @@
// FIXME: should there be a special protection domain used for native code?
}
/**
-diff -rBublibjava/java/lang/SecurityManager.javalibjava/java/lang/SecurityManager.java
----libjava/java/lang/SecurityManager.java Sun Dec 1 08:16:19 2002
-+++libjava/java/lang/SecurityManager.java Fri Feb 27 02:08:27 2004
+diff -rBub libjava/java/lang/SecurityManager.javalibjava/java/lang/SecurityManager.java
+--- libjava/java/lang/SecurityManager.java Sun Dec 1 08:16:19 2002
++++ libjava/java/lang/SecurityManager.java Fri Feb 27 02:08:27 2004
@@ -297,7 +297,8 @@
public Object getSecurityContext()
{
}
/**
-diff -rBublibjava/java/lang/natClass.cclibjava/java/lang/natClass.cc
----libjava/java/lang/natClass.cc Thu May 1 14:52:35 2003
-+++libjava/java/lang/natClass.cc Mon Mar 1 01:00:12 2004
+diff -rBub libjava/java/lang/natClass.cclibjava/java/lang/natClass.cc
+--- libjava/java/lang/natClass.cc Thu May 1 14:52:35 2003
++++ libjava/java/lang/natClass.cc Mon Mar 1 01:00:12 2004
@@ -72,8 +72,10 @@
_Jv_Utf8Const *name = _Jv_makeUtf8Const (buffer, length);
int index = 0;
_Jv_MethodSymbol sym = klass->otable_syms[0];
-diff -rBublibjava/java/lang/natClassLoader.cclibjava/java/lang/natClassLoader.cc
----libjava/java/lang/natClassLoader.cc Thu Dec 19 11:32:17 2002
-+++libjava/java/lang/natClassLoader.cc Sun Feb 29 23:55:48 2004
+diff -rBub libjava/java/lang/natClassLoader.cclibjava/java/lang/natClassLoader.cc
+--- libjava/java/lang/natClassLoader.cc Thu Dec 19 11:32:17 2002
++++ libjava/java/lang/natClassLoader.cc Sun Feb 29 23:55:48 2004
@@ -195,6 +195,7 @@
_Jv_Constants *pool = &klass->constants;
for (int index = 1; index < pool->size; ++index)
klass->notifyAll ();
_Jv_PushClass (klass);
-diff -rBublibjava/java/security/Security.javalibjava/java/security/Security.java
----libjava/java/security/Security.java Tue Dec 31 14:49:37 2002
-+++libjava/java/security/Security.java Sat Feb 28 21:33:32 2004
+diff -rBub libjava/java/security/Security.javalibjava/java/security/Security.java
+--- libjava/java/security/Security.java Tue Dec 31 14:49:37 2002
++++ libjava/java/security/Security.java Sat Feb 28 21:33:32 2004
@@ -60,9 +60,11 @@
static
}
// This class can't be instantiated.
-diff -rBublibjava/libgcj.spec.inlibjava/libgcj.spec.in
----libjava/libgcj.spec.in Wed Feb 12 18:09:27 2003
-+++libjava/libgcj.spec.in Sun Feb 29 17:15:19 2004
+diff -rBub libjava/libgcj.spec.inlibjava/libgcj.spec.in
+--- libjava/libgcj.spec.in Wed Feb 12 18:09:27 2003
++++ libjava/libgcj.spec.in Sun Feb 29 17:15:19 2004
@@ -4,6 +4,7 @@
# to link with libgcj.
#
+*jc1: @HASH_SYNC_SPEC@ @DIVIDESPEC@ @CHECKREFSPEC@ @JC1GCSPEC@ @EXCEPTIONSPEC@ @BACKTRACESPEC@ @IEEESPEC@ -fkeep-inline-functions -fno-omit-frame-pointer -Os -ffunction-sections -fdata-sections
-*jc1: @HASH_SYNC_SPEC@ @DIVIDESPEC@ @CHECKREFSPEC@ @JC1GCSPEC@ @EXCEPTIONSPEC@ @BACKTRACESPEC@ @IEEESPEC@ -fkeep-inline-functions
-diff -rBublibjava/prims.cclibjava/prims.cc
----libjava/prims.cc Fri Apr 25 09:02:21 2003
-+++libjava/prims.cc Sat Feb 28 20:32:25 2004
+diff -rBub libjava/prims.cclibjava/prims.cc
+--- libjava/prims.cc Fri Apr 25 09:02:21 2003
++++ libjava/prims.cc Sat Feb 28 20:32:25 2004
@@ -165,6 +165,7 @@
{
int len;
_Jv_GCInitializeFinalizers (&::gnu::gcj::runtime::FinalizerThread::finalizerReady);
+--- gcc/toplev.c Mon May 5 14:55:26 2003
++++ gcc/toplev.c Wed Mar 10 05:10:33 2004
+@@ -975,6 +975,7 @@
+ if `-fSTRING' is seen as an option.
+ (If `-fno-STRING' is seen as an option, the opposite value is stored.) */
+
++static int ignoreme;
+ static const lang_independent_options f_options[] =
+ {
+ {"eliminate-dwarf2-dups", &flag_eliminate_dwarf2_dups, 1,
+@@ -1188,6 +1189,8 @@
+ N_("Trap for signed overflow in addition / subtraction / multiplication") },
+ { "new-ra", &flag_new_regalloc, 1,
+ N_("Use graph coloring register allocation.") },
++ { "inhibit-reflection", &ignoreme, 1,
++ N_("ignored.") },
+ };
+
+ /* Table of language-specific options. */