diff options
| author | gandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-23 15:19:26 +0000 |
|---|---|---|
| committer | gandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-23 15:19:26 +0000 |
| commit | 5c7411981584e487ac41794feb98a66df9fd6fcb (patch) | |
| tree | febe3d4d4c0c994db223fee8e819bde6582494c9 /libjava/gcj | |
| parent | 112dfe9f689af01c2dd00e0f153fc25d69095b6c (diff) | |
| download | ppe42-gcc-5c7411981584e487ac41794feb98a66df9fd6fcb.tar.gz ppe42-gcc-5c7411981584e487ac41794feb98a66df9fd6fcb.zip | |
Merge GNU Classpath 0.99 into libjava.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185741 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gcj')
| -rw-r--r-- | libjava/gcj/Makefile.in | 2 | ||||
| -rw-r--r-- | libjava/gcj/javaprims.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index 44979381271..3951e358907 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -135,7 +135,6 @@ EXCEPTIONSPEC = @EXCEPTIONSPEC@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GCC_FOR_ECJX = @GCC_FOR_ECJX@ -GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@ GCDEPS = @GCDEPS@ GCINCS = @GCINCS@ GCJ = @GCJ@ @@ -183,6 +182,7 @@ LIBART_LIBS = @LIBART_LIBS@ LIBDIR = @LIBDIR@ LIBFFI = @LIBFFI@ LIBFFIINCS = @LIBFFIINCS@ +LIBGCC_UNWIND_INCLUDE = @LIBGCC_UNWIND_INCLUDE@ LIBGCJDEBUG = @LIBGCJDEBUG@ LIBGCJTESTSPEC = @LIBGCJTESTSPEC@ LIBGCJ_BC_SPEC = @LIBGCJ_BC_SPEC@ diff --git a/libjava/gcj/javaprims.h b/libjava/gcj/javaprims.h index 3d4c3c947cb..19178ef878c 100644 --- a/libjava/gcj/javaprims.h +++ b/libjava/gcj/javaprims.h @@ -65,6 +65,7 @@ extern "Java" class CharArrayWriter; class CharConversionException; class Closeable; + class Console; class DataInput; class DataInputStream; class DataOutput; @@ -88,6 +89,7 @@ extern "Java" class FilterReader; class FilterWriter; class Flushable; + class IOError; class IOException; class InputStream; class InputStreamReader; @@ -108,6 +110,7 @@ extern "Java" class ObjectOutput; class ObjectOutputStream; class ObjectOutputStream$1; + class ObjectOutputStream$2; class ObjectOutputStream$PutField; class ObjectStreamClass; class ObjectStreamClass$1; @@ -142,6 +145,7 @@ extern "Java" class SyncFailedException; class UTFDataFormatException; class UnsupportedEncodingException; + class VMConsole; class VMObjectInputStream; class VMObjectStreamClass; class WriteAbortedException; |
