diff options
| author | Tom Tromey <tromey@gcc.gnu.org> | 2004-11-25 03:47:08 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2004-11-25 03:47:08 +0000 |
| commit | 367390404d26b7bfc400d77893579e83e2a19fb9 (patch) | |
| tree | 477abdf83653e20b0e74447d6ca47eb67b0511b8 /libjava/gcj | |
| parent | ec0641f612862498e829fdaf040a201c0ba68762 (diff) | |
| download | gcc-367390404d26b7bfc400d77893579e83e2a19fb9.zip gcc-367390404d26b7bfc400d77893579e83e2a19fb9.tar.gz gcc-367390404d26b7bfc400d77893579e83e2a19fb9.tar.bz2 | |
* Merged gcj-abi-2-dev-branch to trunk.
(Actual changes too large to list in the commit message;
see ChangeLog.)
From-SVN: r91270
Diffstat (limited to 'libjava/gcj')
| -rw-r--r-- | libjava/gcj/Makefile.in | 1 | ||||
| -rw-r--r-- | libjava/gcj/field.h | 13 | ||||
| -rw-r--r-- | libjava/gcj/javaprims.h | 3 |
3 files changed, 5 insertions, 12 deletions
diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index b4c32fb..b40dd2a 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -146,6 +146,7 @@ LIBGCJTESTSPEC = @LIBGCJTESTSPEC@ LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@ LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@ LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@ +LIBGCJ_LD_SYMBOLIC = @LIBGCJ_LD_SYMBOLIC@ LIBICONV = @LIBICONV@ LIBLTDL = @LIBLTDL@ LIBOBJS = @LIBOBJS@ diff --git a/libjava/gcj/field.h b/libjava/gcj/field.h index bd6b2c3..8421bc7e 100644 --- a/libjava/gcj/field.h +++ b/libjava/gcj/field.h @@ -1,6 +1,6 @@ // field.h - Header file for fieldID instances. -*- c++ -*- -/* Copyright (C) 1998, 1999, 2000 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2004 Free Software Foundation This file is part of libgcj. @@ -21,9 +21,7 @@ details. */ struct _Jv_Field { -#ifndef COMPACT_FIELDS struct _Jv_Utf8Const* name; -#endif /* The type of the field, if isResolved(). If !isResolved(): The fields's signature as a (Utf8Const*). */ @@ -31,11 +29,7 @@ struct _Jv_Field _Jv_ushort flags; -#ifdef COMPACT_FIELDS - jshort nameIndex; /* offset in class's name table */ -#else _Jv_ushort bsize; /* not really needed ... */ -#endif union { jint boffset; /* offset in bytes for instance field */ @@ -91,13 +85,8 @@ struct _Jv_Field return flags & java::lang::reflect::Modifier::ALL_FLAGS; } -#ifdef COMPACT_FIELDS - _Jv_Utf8Const * getNameUtf8Const (jclass cls) - { return clas->fieldNames + nameIndex; } -#else _Jv_Utf8Const * getNameUtf8Const (jclass) { return name; } #endif -#endif }; #ifdef __cplusplus diff --git a/libjava/gcj/javaprims.h b/libjava/gcj/javaprims.h index 3120184..53c26fe 100644 --- a/libjava/gcj/javaprims.h +++ b/libjava/gcj/javaprims.h @@ -1,5 +1,6 @@ // javaprims.h - Main external header file for libgcj. -*- c++ -*- + /* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation @@ -84,6 +85,7 @@ extern "Java" class LineNumberInputStream; class LineNumberReader; class MemberComparator; + class MyIOException; class NotActiveException; class NotSerializableException; class ObjectInput; @@ -214,6 +216,7 @@ extern "Java" class UnsupportedClassVersionError; class UnsupportedOperationException; class VMClassLoader; + class VMCompiler; class VMSecurityManager; class VMThrowable; class VerifyError; |