Makefile.def: Remove libjava.

2016-09-30  Andrew Haley  <aph@redhat.com>

	* Makefile.def: Remove libjava.
	* Makefile.tpl: Likewise.
	* Makefile.in: Regenerate.
	* configure.ac: Likewise.
	* configure: Likewise.
	* gcc/java: Remove.
	* libjava: Likewise.

From-SVN: r240662

11 files changed, 0 insertions, 887 deletions

diff --git a/libjava/sun/reflect/Reflection.h b/libjava/sun/reflect/Reflection.h
deleted file mode 100644
index 7f3c82f..0000000
--- a/libjava/sun/reflect/Reflection.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_Reflection__
-#define __sun_reflect_Reflection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-        class Reflection;
-    }
-  }
-}
-
-class sun::reflect::Reflection : public ::java::lang::Object
-{
-
-public:
-  Reflection();
-  static ::java::lang::Class * getCallerClass(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_Reflection__
diff --git a/libjava/sun/reflect/Reflection.java b/libjava/sun/reflect/Reflection.java
deleted file mode 100644
index ef25ce7..0000000
--- a/libjava/sun/reflect/Reflection.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Reflection.java - JSR 166 reflection hooks
-   Copyright (C) 2006 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package sun.reflect;
-
-import gnu.classpath.VMStackWalker;
-
-public class Reflection
-{
-  /**
-   * A stack-walking wrapper method used by the JSR 166 RI. 
-   */
-  public static Class getCallerClass(int depth)
-  {
-    return VMStackWalker.getClassContext()[depth];
-  }
-}
diff --git a/libjava/sun/reflect/annotation/AnnotationInvocationHandler.h b/libjava/sun/reflect/annotation/AnnotationInvocationHandler.h
deleted file mode 100644
index 356c8a0..0000000
--- a/libjava/sun/reflect/annotation/AnnotationInvocationHandler.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_annotation_AnnotationInvocationHandler__
-#define __sun_reflect_annotation_AnnotationInvocationHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace annotation
-      {
-          class AnnotationInvocationHandler;
-      }
-    }
-  }
-}
-
-class sun::reflect::annotation::AnnotationInvocationHandler : public ::java::lang::Object
-{
-
-public:
-  AnnotationInvocationHandler(::java::lang::Class *, ::java::util::Map *);
-  static ::java::lang::annotation::Annotation * create(::java::lang::Class *, ::java::util::Map *);
-  jboolean equals(::java::lang::Object *, ::java::lang::Object *);
-private:
-  static jboolean deepEquals(::java::lang::Object *, ::java::lang::Object *);
-  static jint deepHashCode(::java::lang::Object *);
-public:
-  jint hashCode();
-private:
-  static ::java::lang::String * deepToString(::java::lang::Object *);
-public:
-  ::java::lang::String * toString();
-private:
-  static ::java::lang::Class * getBoxedReturnType(::java::lang::reflect::Method *);
-  ::java::lang::Object * coerce(::java::lang::Object *, ::java::lang::Class *);
-public:
-  ::java::lang::Object * invoke(::java::lang::Object *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object * > *);
-private:
-  static const jlong serialVersionUID = 6182022883658399397LL;
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  ::java::util::Map * memberValues;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_annotation_AnnotationInvocationHandler__
diff --git a/libjava/sun/reflect/annotation/AnnotationInvocationHandler.java b/libjava/sun/reflect/annotation/AnnotationInvocationHandler.java
deleted file mode 100644
index f883faa..0000000
--- a/libjava/sun/reflect/annotation/AnnotationInvocationHandler.java
+++ /dev/null
@@ -1,441 +0,0 @@
-/* sun.reflect.annotation.AnnotationInvocationHandler
-   Copyright (C) 2006, 2007
-   Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package sun.reflect.annotation;
-
-import java.io.Serializable;
-import java.lang.annotation.Annotation;
-import java.lang.annotation.AnnotationTypeMismatchException;
-import java.lang.annotation.IncompleteAnnotationException;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.lang.reflect.Array;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * This class exists for serialization compatibility with the JDK.
- * VMs can choose to implement annotations by constructing proxies
- * with this invocation handler, but that is not required.
- * If a different strategy for proxy objects is chosen, they can
- * have a writeReplace method to substitute a Proxy based on this
- * invocation handler is used for serialization.
- */
-public final class AnnotationInvocationHandler
-  implements InvocationHandler, Serializable
-{
-  private static final long serialVersionUID = 6182022883658399397L;
-  private final Class<? extends Annotation> type;
-  private final Map<String, ?> memberValues;
-
-  /**
-   * Construct a new invocation handler for an annotation proxy.
-   * Note that the VM is responsible for filling the memberValues map
-   * with the default values of all the annotation members.
-   */
-  public AnnotationInvocationHandler(Class<? extends Annotation> type, Map memberValues)
-  {
-    this.type = type;
-    this.memberValues = (Map<String, ?>)memberValues;
-  }
-
-  public static Annotation create(Class<? extends Annotation> type, Map memberValues)
-  {
-    for (Method m : type.getDeclaredMethods())
-      {
-	String name = m.getName();
-	if (! memberValues.containsKey(name))
-	  {
-	    // FIXME: what to do about exceptions here?
-	    memberValues.put(name, m.getDefaultValue());
-	  }
-      }
-    AnnotationInvocationHandler handler
-      = new AnnotationInvocationHandler(type, memberValues);
-    return (Annotation) Proxy.newProxyInstance(type.getClassLoader(),
-					       new Class[] { type },
-					       handler);
-  }
-
-  /**
-   * Compare an instance of AnnotationInvocationHandler with another object.
-   * Note that the other object does not have to be an
-   * AnnotationInvocationHandler, any implementation of the annotation
-   * interface is allowed to be compared for equality.
-   * Note that this makes the equals method asymmetric, but this behavior
-   * is specified by Annotation.equals and identical to the JDK.
-   *
-   * This method is public for use by other parts of the VM. Some VMs
-   * (can) use different representations of annotations that reuse this
-   * method.
-   */
-  public boolean equals(Object proxy, Object other)
-  {
-    if (type.isInstance(other))
-      {
-	try
-	  {
-	    Method[] methods = type.getDeclaredMethods();
-	    if (methods.length == memberValues.size())
-	      {
-		for (int i = 0; i < methods.length; i++)
-		  {
-		    String key = methods[i].getName();
-		    Object val = methods[i].invoke(other, (Object[])null);
-		    Object thisVal
-		      = invoke(proxy,
-			       methods[i],
-			       (Object[])null);
-		    if (! deepEquals(thisVal, val))
-		      {
-			return false;
-		      }
-		  }
-		return true;
-	      }
-	  }
-	catch (Throwable _)
-	  {
-	    // Ignore exception, like the JDK
-	  }
-      }
-    return false;
-  }
-
-  private static boolean deepEquals(Object o1, Object o2)
-  {
-    if (o1 == o2)
-      return true;
-
-    if (o1 == null || o2 == null)
-      return false;
-
-    if (o1 instanceof boolean[] && o2 instanceof boolean[])
-      return Arrays.equals((boolean[]) o1, (boolean[]) o2);
-
-    if (o1 instanceof byte[] && o2 instanceof byte[])
-      return Arrays.equals((byte[]) o1, (byte[]) o2);
-
-    if (o1 instanceof char[] && o2 instanceof char[])
-      return Arrays.equals((char[]) o1, (char[]) o2);
-
-    if (o1 instanceof short[] && o2 instanceof short[])
-      return Arrays.equals((short[]) o1, (short[]) o2);
-
-    if (o1 instanceof int[] && o2 instanceof int[])
-      return Arrays.equals((int[]) o1, (int[]) o2);
-
-    if (o1 instanceof float[] && o2 instanceof float[])
-      return Arrays.equals((float[]) o1, (float[]) o2);
-
-    if (o1 instanceof long[] && o2 instanceof long[])
-      return Arrays.equals((long[]) o1, (long[]) o2);
-
-    if (o1 instanceof double[] && o2 instanceof double[])
-      return Arrays.equals((double[]) o1, (double[]) o2);
-
-    if (o1 instanceof Object[] && o2 instanceof Object[])
-      return Arrays.equals((Object[]) o1, (Object[]) o2);
-
-    return o1.equals(o2);
-  }
-
-  private static int deepHashCode(Object obj)
-  {
-    if (obj instanceof boolean[])
-      return Arrays.hashCode((boolean[]) obj);
-
-    if (obj instanceof byte[])
-      return Arrays.hashCode((byte[]) obj);
-
-    if (obj instanceof char[])
-      return Arrays.hashCode((char[]) obj);
-
-    if (obj instanceof short[])
-      return Arrays.hashCode((short[]) obj);
-
-    if (obj instanceof int[])
-      return Arrays.hashCode((int[]) obj);
-
-    if (obj instanceof float[])
-      return Arrays.hashCode((float[]) obj);
-
-    if (obj instanceof long[])
-      return Arrays.hashCode((long[]) obj);
-
-    if (obj instanceof double[])
-      return Arrays.hashCode((double[]) obj);
-
-    if (obj instanceof Object[])
-      return Arrays.hashCode((Object[]) obj);
-
-    return obj.hashCode();
-  }
-
-  /**
-   * Compute the hashCode for an annotation. Note that the algorithm is
-   * specified by Annotation.hashCode.
-   *
-   * This method is public for use by other parts of the VM. Some VMs
-   * (can) use different representations of annotations that reuse this
-   * method.
-   */
-  public int hashCode()
-  {
-    int h = 0;
-    Iterator iter = memberValues.keySet().iterator();
-    while (iter.hasNext())
-      {
-	Object key = iter.next();
-	try
-	  {
-	    Object val
-	      = invoke(null,
-		       type.getDeclaredMethod((String)key, (Class[])null),
-		       (Object[])null);
-	    h += deepHashCode(val) ^ 127 * key.hashCode();
-	  }
-	catch (Throwable _)
-	  {
-	  }
-      }
-    return h;
-  }
-
-  private static String deepToString(Object obj)
-  {
-    if (obj instanceof Object[])
-      return Arrays.toString((Object[]) obj);
-
-    return obj.toString();
-  }
-
-  /**
-   * This method is public for use by other parts of the VM. Some VMs
-   * (can) use different representations of annotations that reuse this
-   * method.
-   */
-  public String toString()
-  {
-    StringBuffer sb = new StringBuffer();
-    sb.append('@').append(type.getName()).append('(');
-    String sep = "";
-    Iterator iter = memberValues.keySet().iterator();
-    while (iter.hasNext())
-      {
-	Object key = iter.next();
-	Object val = memberValues.get(key);
-	sb.append(sep).append(key).append('=').append(deepToString(val));
-	sep = ", ";
-      }
-    sb.append(')');
-    return sb.toString();
-  }
-
-
-  private static Class getBoxedReturnType(Method method)
-  {
-    Class returnType = method.getReturnType();
-
-    if (returnType == boolean.class)
-      return Boolean.class;
-
-    if (returnType == byte.class)
-      return Byte.class;
-
-    if (returnType == char.class)
-      return Character.class;
-
-    if (returnType == short.class)
-      return Short.class;
-
-    if (returnType == int.class)
-      return Integer.class;
-
-    if (returnType == float.class)
-      return Float.class;
-
-    if (returnType == long.class)
-      return Long.class;
-
-    if (returnType == double.class)
-      return Double.class;
-
-    return returnType;
-  }
-
-  // This is slightly awkward.  When the value of an annotation is an
-  // array, libgcj constructs an Object[], but the value() method
-  // returns an arrays of the appropriate primitive type.  We should
-  // perhaps save the resulting array rather than the Object[].
-
-  private Object coerce(Object val, Class dstType)
-    throws ArrayStoreException
-  {
-    if (! val.getClass().isArray())
-      return val;
-
-    Object[] srcArray = (Object[])val;
-    final int len = srcArray.length;
-
-    if (dstType.getComponentType().isPrimitive())
-      {
-	if (dstType == boolean[].class)
-	  {
-	    boolean[] dst = new boolean[len];
-	    for (int i = 0; i < len; i++)
-	      dst[i] = (Boolean)srcArray[i];
-	    return dst;
-	  }
-
-	if (dstType == byte[].class)
-	  {
-	    byte[] dst = new byte[len];
-	    for (int i = 0; i < len; i++)
-	      dst[i] = (Byte)srcArray[i];
-	    return dst;
-	  }
-
-	if (dstType == char[].class)
-	  {
-	    char[] dst = new char[len];
-	    for (int i = 0; i < len; i++)
-	      dst[i] = (Character)srcArray[i];
-	    return dst;
-	  }
-
-	if (dstType == short[].class)
-	  {
-	    short[] dst = new short[len];
-	    for (int i = 0; i < len; i++)
-	      dst[i] = (Short)srcArray[i];
-	    return dst;
-	  }
-
-	if (dstType == int[].class)
-	  {
-	    int[] dst = new int[len];
-	    for (int i = 0; i < len; i++)
-	      dst[i] = (Integer)srcArray[i];
-	    return dst;
-	  }
-
-	if (dstType == long[].class)
-	  {
-	    long[] dst = new long[len];
-	    for (int i = 0; i < len; i++)
-	      dst[i] = (Long)srcArray[i];
-	    return dst;
-	  }
-
-	if (dstType == float[].class)
-	  {
-	    float[] dst = new float[len];
-	    for (int i = 0; i < len; i++)
-	      dst[i] = (Float)srcArray[i];
-	    return dst;
-	  }
-
-	if (dstType == double[].class)
-	  {
-	    double[] dst = new double[len];
-	    for (int i = 0; i < len; i++)
-	      dst[i] = (Double)srcArray[i];
-	    return dst;
-	  }
-      }
-
-    Object dst = Array.newInstance(dstType.getComponentType(), len);
-    System.arraycopy((Object)srcArray, 0, dst, 0, len);
-    return dst;
-  }
-
-  public Object invoke(Object proxy, Method method, Object[] args)
-    throws Throwable
-  {
-    String methodName = method.getName().intern();
-
-    if (args == null || args.length == 0)
-      {
-	if (methodName == "toString")
-	  {
-	    return toString();
-	  }
-	else if (methodName == "hashCode")
-	  {
-	    return Integer.valueOf(hashCode());
-	  }
-	else if (methodName == "annotationType")
-	  {
-	    return type;
-	  }
-	else
-	  {
-	    Object val = memberValues.get(methodName);
-	    if (val == null)
-	      {
-		throw new IncompleteAnnotationException(type, methodName);
-	      }
-	    try
-	      {
-		if (val.getClass().isArray())
-		  val = coerce((Object[])val, method.getReturnType());
-	      }
-	    catch (ArrayStoreException _)
-	      {
-		throw new AnnotationTypeMismatchException
-		  (method, val.getClass().getName());
-	      }
-	    if (! getBoxedReturnType(method).isInstance(val))
-	      throw (new AnnotationTypeMismatchException
-		     (method, val.getClass().getName()));
-	    return val;
-	  }
-      }
-    else if (args.length == 1)
-      {
-	if (methodName == "equals")
-	  {
-	    return Boolean.valueOf(equals(proxy, args[0]));
-	  }
-      }
-    throw new InternalError("Invalid annotation proxy");
-  }
-}
diff --git a/libjava/sun/reflect/annotation/AnnotationParser.h b/libjava/sun/reflect/annotation/AnnotationParser.h
deleted file mode 100644
index d5ca973..0000000
--- a/libjava/sun/reflect/annotation/AnnotationParser.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_annotation_AnnotationParser__
-#define __sun_reflect_annotation_AnnotationParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace annotation
-      {
-          class AnnotationParser;
-      }
-    }
-  }
-}
-
-class sun::reflect::annotation::AnnotationParser : public ::java::lang::Object
-{
-
-public:
-  AnnotationParser();
-  static ::java::lang::annotation::Annotation * annotationForMap(::java::lang::Class *, ::java::util::Map *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_annotation_AnnotationParser__
diff --git a/libjava/sun/reflect/annotation/AnnotationType.h b/libjava/sun/reflect/annotation/AnnotationType.h
deleted file mode 100644
index 3d21e0f..0000000
--- a/libjava/sun/reflect/annotation/AnnotationType.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_annotation_AnnotationType__
-#define __sun_reflect_annotation_AnnotationType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace annotation
-      {
-          class AnnotationType;
-      }
-    }
-  }
-}
-
-class sun::reflect::annotation::AnnotationType : public ::java::lang::Object
-{
-
-public:
-  AnnotationType();
-  static ::java::lang::Class * invocationHandlerReturnType(::java::lang::Class *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_annotation_AnnotationType__
diff --git a/libjava/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.h b/libjava/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.h
deleted file mode 100644
index 63d853b..0000000
--- a/libjava/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_annotation_EnumConstantNotPresentExceptionProxy__
-#define __sun_reflect_annotation_EnumConstantNotPresentExceptionProxy__
-
-#pragma interface
-
-#include <sun/reflect/annotation/ExceptionProxy.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace annotation
-      {
-          class EnumConstantNotPresentExceptionProxy;
-      }
-    }
-  }
-}
-
-class sun::reflect::annotation::EnumConstantNotPresentExceptionProxy : public ::sun::reflect::annotation::ExceptionProxy
-{
-
-public:
-  EnumConstantNotPresentExceptionProxy(::java::lang::Class *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_annotation_EnumConstantNotPresentExceptionProxy__
diff --git a/libjava/sun/reflect/annotation/ExceptionProxy.h b/libjava/sun/reflect/annotation/ExceptionProxy.h
deleted file mode 100644
index ca6a3cd..0000000
--- a/libjava/sun/reflect/annotation/ExceptionProxy.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_annotation_ExceptionProxy__
-#define __sun_reflect_annotation_ExceptionProxy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace annotation
-      {
-          class ExceptionProxy;
-      }
-    }
-  }
-}
-
-class sun::reflect::annotation::ExceptionProxy : public ::java::lang::Object
-{
-
-public:
-  ExceptionProxy();
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_annotation_ExceptionProxy__
diff --git a/libjava/sun/reflect/misc/ReflectUtil$MustBeNull.h b/libjava/sun/reflect/misc/ReflectUtil$MustBeNull.h
deleted file mode 100644
index a2e7494..0000000
--- a/libjava/sun/reflect/misc/ReflectUtil$MustBeNull.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_misc_ReflectUtil$MustBeNull__
-#define __sun_reflect_misc_ReflectUtil$MustBeNull__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace misc
-      {
-          class ReflectUtil$MustBeNull;
-      }
-    }
-  }
-}
-
-class sun::reflect::misc::ReflectUtil$MustBeNull : public ::java::lang::Object
-{
-
-  ReflectUtil$MustBeNull();
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_misc_ReflectUtil$MustBeNull__
diff --git a/libjava/sun/reflect/misc/ReflectUtil.h b/libjava/sun/reflect/misc/ReflectUtil.h
deleted file mode 100644
index 91c0b64..0000000
--- a/libjava/sun/reflect/misc/ReflectUtil.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_misc_ReflectUtil__
-#define __sun_reflect_misc_ReflectUtil__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace misc
-      {
-          class ReflectUtil;
-          class ReflectUtil$MustBeNull;
-      }
-    }
-  }
-}
-
-class sun::reflect::misc::ReflectUtil : public ::java::lang::Object
-{
-
-public:
-  ReflectUtil();
-  static void checkPackageAccess(::java::lang::Class *);
-  static void ensureMemberAccess(::java::lang::Class *, ::java::lang::Class *, ::sun::reflect::misc::ReflectUtil$MustBeNull *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_misc_ReflectUtil__
diff --git a/libjava/sun/reflect/misc/ReflectUtil.java b/libjava/sun/reflect/misc/ReflectUtil.java
deleted file mode 100644
index 88a6f25..0000000
--- a/libjava/sun/reflect/misc/ReflectUtil.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/* ReflectUtil.java - JSR 166 reflection hooks
-   Copyright (C) 2006 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package sun.reflect.misc;
-
-import java.lang.reflect.Modifier;
-
-public class ReflectUtil
-{
-  // We use this inaccessible inner class as an argument type
-  // in verifyMemberAccess.  All current users of this method
-  // in the JSR 166 RI pass 'null' for this argument, and
-  // consequently we don't know what it means.  Using a funny
-  // type like this for the argument means that if the RI changes,
-  // we will see a compilation error.
-  private static class MustBeNull
-  {
-  }
-
-  /**
-   * Check if the current thread is allowed to access the package of
-   * the declaringClass. 
-   *
-   * @param declaringClass class name to check access to
-   * @throws SecurityException if permission is denied
-   * @throws NullPointerException if declaringClass is null
-   */
-  public static void checkPackageAccess(Class declaringClass)
-  {
-    SecurityManager sm;
-    if ((sm = System.getSecurityManager()) != null)
-      {
-	while (declaringClass.isArray())
-	  declaringClass = declaringClass.getComponentType();
-	String name = declaringClass.getName();
-	int i = name.lastIndexOf('.');
-	if (i != -1) // if declaringClass is a member of a package
-	  {
-	    name = name.substring(0, i);
-	    sm.checkPackageAccess(name);
-	  }
-      }
-  }
-
-  /**
-   * Perform access checks on a member of a class.  This API is
-   * derived from the public domain code in the JSR 166 reference
-   * implementation.
-   * @param caller the class requesting access to the member
-   * @param declarer the declaring class of the member
-   * @param ignored unknown parameter; always null
-   * @param modifiers the modifiers on the member
-   * @return true if access is granted, false otherwise
-   */
-  public static void ensureMemberAccess(Class caller,
-                                        Class declarer,
-                                        MustBeNull ignored,
-                                        int modifiers)
-  {
-    // Same class, always ok.
-    if (caller == declarer)
-      return;
-    // Public access is ok.
-    if ((modifiers & Modifier.PUBLIC) != 0)
-      return;
-    // Protected access and request comes from
-    // a subclass of the declarer -- ok.
-    if ((modifiers & Modifier.PROTECTED) != 0
-        && declarer.isAssignableFrom(caller))
-      return;
-    // Package-private access, or protected access,
-    // and the packages are the same --ok.
-    if ((modifiers & Modifier.PRIVATE) == 0
-        && caller.getPackage() == declarer.getPackage())
-      return;
-    // Otherwise, no.
-    throw new IllegalAccessError();
-  }
-}