2 files changed, 105 insertions, 4 deletions

diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in
index 26fec338ae7..bd13f3d9e66 100644
--- a/libjava/gcj/Makefile.in
+++ b/libjava/gcj/Makefile.in
@@ -129,7 +129,7 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -198,7 +198,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
diff --git a/libjava/gcj/javaprims.h b/libjava/gcj/javaprims.h
index 059292269ef..e3d01abf1ec 100644
--- a/libjava/gcj/javaprims.h
+++ b/libjava/gcj/javaprims.h
@@ -214,9 +214,13 @@ extern "Java"
       class AbstractCollection;
       class AbstractList;
       class AbstractList$SubList;
+      class AbstractSet;
       class Arrays;
       class Arrays$ListImpl;
+      class BasicMapEntry;
       class BitSet;
+      class Bucket;
+      class Bucket$Node;
       class Calendar;
       class Collection;
       class Comparator;
@@ -229,13 +233,18 @@ extern "Java"
       class EventObject;
       class GregorianCalendar;
       class Hashtable;
-      class HashtableEntry;
-      class HashtableEnumeration;
+      class Hashtable$HashtableCollection;
+      class Hashtable$HashtableEntry;
+      class Hashtable$HashtableEnumeration;
+      class Hashtable$HashtableIterator;
+      class Hashtable$HashtableSet;
       class Iterator;
       class List;
       class ListIterator;
       class ListResourceBundle;
       class Locale;
+      class Map;
+      class Map$Entry;
       class MissingResourceException;
       class NoSuchElementException;
       class Observable;
@@ -244,6 +253,7 @@ extern "Java"
       class PropertyResourceBundle;
       class Random;
       class ResourceBundle;
+      class Set;
       class SimpleTimeZone;
       class Stack;
       class StringTokenizer;
@@ -253,9 +263,14 @@ extern "Java"
       class VectorEnumeration;
       namespace jar
       {
+	class Attributes;
         class JarEntry;
+        class JarException;
         class JarFile;
+        class JarFile$JarEnumeration;
         class JarInputStream;
+        class JarOutputStream;
+        class Manifest;
       };
 
       namespace zip
@@ -282,6 +297,92 @@ extern "Java"
       };
     };
   };
+  namespace java
+  {
+    namespace io
+    {
+      class BlockDataException;
+      class BufferedInputStream;
+      class BufferedOutputStream;
+      class BufferedReader;
+      class BufferedWriter;
+      class ByteArrayInputStream;
+      class ByteArrayOutputStream;
+      class CharArrayReader;
+      class CharArrayWriter;
+      class CharConversionException;
+      class DataInput;
+      class DataInputStream;
+      class DataOutput;
+      class DataOutputStream;
+      class EOFException;
+      class Externalizable;
+      class File;
+      class FileDescriptor;
+      class FileInputStream;
+      class FileNotFoundException;
+      class FileOutputStream;
+      class FileReader;
+      class FileWriter;
+      class FilenameFilter;
+      class FilterInputStream;
+      class FilterOutputStream;
+      class FilterReader;
+      class FilterWriter;
+      class IOException;
+      class InputStream;
+      class InputStreamReader;
+      class InterfaceComparator;
+      class InterruptedIOException;
+      class InvalidClassException;
+      class InvalidObjectException;
+      class LineNumberInputStream;
+      class LineNumberReader;
+      class MemberComparator;
+      class NotActiveException;
+      class NotSerializableException;
+      class ObjectInput;
+      class ObjectInputStream;
+      class ObjectInputStream$GetField;
+      class ObjectInputValidation;
+      class ObjectOutput;
+      class ObjectOutputStream;
+      class ObjectOutputStream$PutField;
+      class ObjectStreamClass;
+      class ObjectStreamConstants;
+      class ObjectStreamException;
+      class ObjectStreamField;
+      class OptionalDataException;
+      class OutputStream;
+      class OutputStreamWriter;
+      class PipedInputStream;
+      class PipedOutputStream;
+      class PipedReader;
+      class PipedWriter;
+      class PrintStream;
+      class PrintWriter;
+      class PushbackInputStream;
+      class PushbackReader;
+      class RandomAccessFile;
+      class Reader;
+      class Replaceable;
+      class Resolvable;
+      class SequenceInputStream;
+      class Serializable;
+      class SerializablePermission;
+      class StreamCorruptedException;
+      class StreamTokenizer;
+      class StringBufferInputStream;
+      class StringReader;
+      class StringWriter;
+      class SyncFailedException;
+      class UTFDataFormatException;
+      class UnsupportedEncodingException;
+      class ValidatorAndPriority;
+      class WriteAbortedException;
+      class Writer;
+    };
+  };
 };
 
 typedef struct java::lang::Object* jobject;