javaprims.h: Updated class list.

	* gcj/javaprims.h: Updated class list.
	* java/util/Hashtable.java: Re-merged with Classpath.

From-SVN: r46295

1 files changed, 6 insertions, 2 deletions

diff --git a/libjava/gcj/javaprims.h b/libjava/gcj/javaprims.h
index f9cac09..1382e4a 100644
--- a/libjava/gcj/javaprims.h
+++ b/libjava/gcj/javaprims.h
@@ -279,16 +279,18 @@ extern "Java"
       class EventObject;
       class GregorianCalendar;
       class HashMap;
-      class HashMap$Entry;
+      class HashMap$HashEntry;
       class HashMap$HashIterator;
       class HashSet;
       class Hashtable;
-      class Hashtable$Entry;
       class Hashtable$Enumerator;
+      class Hashtable$HashEntry;
       class Hashtable$HashIterator;
       class IdentityHashMap;
       class IdentityHashMap$IdentityIterator;
       class Iterator;
+      class LinkedHashMap;
+      class LinkedHashMap$LinkedHashEntry;
       class LinkedList;
       class LinkedList$Entry;
       class LinkedList$LinkedListItr;
@@ -298,6 +300,7 @@ extern "Java"
       class Locale;
       class Map;
       class Map$Entry;
+      class Map$Map;
       class MissingResourceException;
       class NoSuchElementException;
       class Observable;
@@ -306,6 +309,7 @@ extern "Java"
       class PropertyPermission;
       class PropertyResourceBundle;
       class Random;
+      class RandomAccess;
       class ResourceBundle;
       class Set;
       class SimpleTimeZone;