obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

47 files changed, 2636 insertions, 0 deletions

diff --git a/libjava/java/awt/geom/AffineTransform.h b/libjava/java/awt/geom/AffineTransform.h
new file mode 100644
index 000000000..4c5efc8bb
--- /dev/null
+++ b/libjava/java/awt/geom/AffineTransform.h
@@ -0,0 +1,111 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_AffineTransform__
+#define __java_awt_geom_AffineTransform__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Shape;
+      namespace geom
+      {
+          class AffineTransform;
+          class Point2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::AffineTransform : public ::java::lang::Object
+{
+
+public:
+  AffineTransform();
+  AffineTransform(::java::awt::geom::AffineTransform *);
+  AffineTransform(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
+  AffineTransform(JArray< jfloat > *);
+  AffineTransform(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  AffineTransform(JArray< jdouble > *);
+  static ::java::awt::geom::AffineTransform * getTranslateInstance(jdouble, jdouble);
+  static ::java::awt::geom::AffineTransform * getRotateInstance(jdouble);
+  static ::java::awt::geom::AffineTransform * getRotateInstance(jdouble, jdouble, jdouble);
+  static ::java::awt::geom::AffineTransform * getScaleInstance(jdouble, jdouble);
+  static ::java::awt::geom::AffineTransform * getShearInstance(jdouble, jdouble);
+  virtual jint getType();
+  virtual jdouble getDeterminant();
+  virtual void getMatrix(JArray< jdouble > *);
+  virtual jdouble getScaleX();
+  virtual jdouble getScaleY();
+  virtual jdouble getShearX();
+  virtual jdouble getShearY();
+  virtual jdouble getTranslateX();
+  virtual jdouble getTranslateY();
+  virtual void translate(jdouble, jdouble);
+  virtual void rotate(jdouble);
+  virtual void rotate(jdouble, jdouble, jdouble);
+  virtual void scale(jdouble, jdouble);
+  virtual void shear(jdouble, jdouble);
+  virtual void setToIdentity();
+  virtual void setToTranslation(jdouble, jdouble);
+  virtual void setToRotation(jdouble);
+  virtual void setToRotation(jdouble, jdouble, jdouble);
+  virtual void setToScale(jdouble, jdouble);
+  virtual void setToShear(jdouble, jdouble);
+  virtual void setTransform(::java::awt::geom::AffineTransform *);
+  virtual void setTransform(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  virtual void concatenate(::java::awt::geom::AffineTransform *);
+  virtual void preConcatenate(::java::awt::geom::AffineTransform *);
+  virtual ::java::awt::geom::AffineTransform * createInverse();
+  virtual ::java::awt::geom::Point2D * transform(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
+  virtual void transform(JArray< ::java::awt::geom::Point2D * > *, jint, JArray< ::java::awt::geom::Point2D * > *, jint, jint);
+  virtual void transform(JArray< jfloat > *, jint, JArray< jfloat > *, jint, jint);
+  virtual void transform(JArray< jdouble > *, jint, JArray< jdouble > *, jint, jint);
+  virtual void transform(JArray< jfloat > *, jint, JArray< jdouble > *, jint, jint);
+  virtual void transform(JArray< jdouble > *, jint, JArray< jfloat > *, jint, jint);
+  virtual ::java::awt::geom::Point2D * inverseTransform(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
+  virtual void inverseTransform(JArray< jdouble > *, jint, JArray< jdouble > *, jint, jint);
+  virtual ::java::awt::geom::Point2D * deltaTransform(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
+  virtual void deltaTransform(JArray< jdouble > *, jint, JArray< jdouble > *, jint, jint);
+  virtual ::java::awt::Shape * createTransformedShape(::java::awt::Shape *);
+  virtual ::java::lang::String * toString();
+  virtual jboolean isIdentity();
+  virtual ::java::lang::Object * clone();
+  virtual jint hashCode();
+  virtual jboolean equals(::java::lang::Object *);
+private:
+  void updateType();
+  void readObject(::java::io::ObjectInputStream *);
+  static const jlong serialVersionUID = 1330973210523860834LL;
+public:
+  static const jint TYPE_IDENTITY = 0;
+  static const jint TYPE_TRANSLATION = 1;
+  static const jint TYPE_UNIFORM_SCALE = 2;
+  static const jint TYPE_GENERAL_SCALE = 4;
+  static const jint TYPE_MASK_SCALE = 6;
+  static const jint TYPE_FLIP = 64;
+  static const jint TYPE_QUADRANT_ROTATION = 8;
+  static const jint TYPE_GENERAL_ROTATION = 16;
+  static const jint TYPE_MASK_ROTATION = 24;
+  static const jint TYPE_GENERAL_TRANSFORM = 32;
+private:
+  jdouble __attribute__((aligned(__alignof__( ::java::lang::Object)))) m00;
+  jdouble m10;
+  jdouble m01;
+  jdouble m11;
+  jdouble m02;
+  jdouble m12;
+  jint type;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_AffineTransform__
diff --git a/libjava/java/awt/geom/Arc2D$ArcIterator.h b/libjava/java/awt/geom/Arc2D$ArcIterator.h
new file mode 100644
index 000000000..4fdf0e15c
--- /dev/null
+++ b/libjava/java/awt/geom/Arc2D$ArcIterator.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Arc2D$ArcIterator__
+#define __java_awt_geom_Arc2D$ArcIterator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class AffineTransform;
+          class Arc2D;
+          class Arc2D$ArcIterator;
+          class Ellipse2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Arc2D$ArcIterator : public ::java::lang::Object
+{
+
+public:
+  Arc2D$ArcIterator(::java::awt::geom::Arc2D *, ::java::awt::geom::AffineTransform *);
+  Arc2D$ArcIterator(::java::awt::geom::Ellipse2D *, ::java::awt::geom::AffineTransform *);
+  jint getWindingRule();
+  jboolean isDone();
+  void next();
+  jint currentSegment(JArray< jfloat > *);
+  jint currentSegment(JArray< jdouble > *);
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
+  jint limit;
+  ::java::awt::geom::AffineTransform * xform;
+  jdouble x;
+  jdouble y;
+  jdouble w;
+  jdouble h;
+  jdouble start;
+  jdouble extent;
+  jint type;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Arc2D$ArcIterator__
diff --git a/libjava/java/awt/geom/Arc2D$Double.h b/libjava/java/awt/geom/Arc2D$Double.h
new file mode 100644
index 000000000..d39148b70
--- /dev/null
+++ b/libjava/java/awt/geom/Arc2D$Double.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Arc2D$Double__
+#define __java_awt_geom_Arc2D$Double__
+
+#pragma interface
+
+#include <java/awt/geom/Arc2D.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class Arc2D$Double;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Arc2D$Double : public ::java::awt::geom::Arc2D
+{
+
+public:
+  Arc2D$Double();
+  Arc2D$Double(jint);
+  Arc2D$Double(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jint);
+  Arc2D$Double(::java::awt::geom::Rectangle2D *, jdouble, jdouble, jint);
+  virtual jdouble getX();
+  virtual jdouble getY();
+  virtual jdouble getWidth();
+  virtual jdouble getHeight();
+  virtual jdouble getAngleStart();
+  virtual jdouble getAngleExtent();
+  virtual jboolean isEmpty();
+  virtual void setArc(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jint);
+  virtual void setAngleStart(jdouble);
+  virtual void setAngleExtent(jdouble);
+public: // actually protected
+  virtual ::java::awt::geom::Rectangle2D * makeBounds(jdouble, jdouble, jdouble, jdouble);
+public:
+  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::Arc2D)))) x;
+  jdouble y;
+  jdouble width;
+  jdouble height;
+  jdouble start;
+  jdouble extent;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Arc2D$Double__
diff --git a/libjava/java/awt/geom/Arc2D$Float.h b/libjava/java/awt/geom/Arc2D$Float.h
new file mode 100644
index 000000000..925c425ac
--- /dev/null
+++ b/libjava/java/awt/geom/Arc2D$Float.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Arc2D$Float__
+#define __java_awt_geom_Arc2D$Float__
+
+#pragma interface
+
+#include <java/awt/geom/Arc2D.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class Arc2D$Float;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Arc2D$Float : public ::java::awt::geom::Arc2D
+{
+
+public:
+  Arc2D$Float();
+  Arc2D$Float(jint);
+  Arc2D$Float(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat, jint);
+  Arc2D$Float(::java::awt::geom::Rectangle2D *, jfloat, jfloat, jint);
+  virtual jdouble getX();
+  virtual jdouble getY();
+  virtual jdouble getWidth();
+  virtual jdouble getHeight();
+  virtual jdouble getAngleStart();
+  virtual jdouble getAngleExtent();
+  virtual jboolean isEmpty();
+  virtual void setArc(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jint);
+  virtual void setAngleStart(jdouble);
+  virtual void setAngleExtent(jdouble);
+public: // actually protected
+  virtual ::java::awt::geom::Rectangle2D * makeBounds(jdouble, jdouble, jdouble, jdouble);
+public:
+  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::Arc2D)))) x;
+  jfloat y;
+  jfloat width;
+  jfloat height;
+  jfloat start;
+  jfloat extent;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Arc2D$Float__
diff --git a/libjava/java/awt/geom/Arc2D.h b/libjava/java/awt/geom/Arc2D.h
new file mode 100644
index 000000000..d2bfc7527
--- /dev/null
+++ b/libjava/java/awt/geom/Arc2D.h
@@ -0,0 +1,72 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Arc2D__
+#define __java_awt_geom_Arc2D__
+
+#pragma interface
+
+#include <java/awt/geom/RectangularShape.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class AffineTransform;
+          class Arc2D;
+          class Dimension2D;
+          class PathIterator;
+          class Point2D;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Arc2D : public ::java::awt::geom::RectangularShape
+{
+
+public: // actually protected
+  Arc2D(jint);
+public:
+  virtual jdouble getAngleStart() = 0;
+  virtual jdouble getAngleExtent() = 0;
+  virtual jint getArcType();
+  virtual ::java::awt::geom::Point2D * getStartPoint();
+  virtual ::java::awt::geom::Point2D * getEndPoint();
+  virtual void setArc(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jint) = 0;
+  virtual void setArc(::java::awt::geom::Point2D *, ::java::awt::geom::Dimension2D *, jdouble, jdouble, jint);
+  virtual void setArc(::java::awt::geom::Rectangle2D *, jdouble, jdouble, jint);
+  virtual void setArc(::java::awt::geom::Arc2D *);
+  virtual void setArcByCenter(jdouble, jdouble, jdouble, jdouble, jdouble, jint);
+  virtual void setArcByTangent(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, jdouble);
+  virtual void setAngleStart(jdouble) = 0;
+  virtual void setAngleExtent(jdouble) = 0;
+  virtual void setAngleStart(::java::awt::geom::Point2D *);
+  virtual void setAngles(jdouble, jdouble, jdouble, jdouble);
+  virtual void setAngles(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
+  virtual void setArcType(jint);
+  virtual void setFrame(jdouble, jdouble, jdouble, jdouble);
+  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
+public: // actually protected
+  virtual ::java::awt::geom::Rectangle2D * makeBounds(jdouble, jdouble, jdouble, jdouble) = 0;
+public:
+  virtual jboolean containsAngle(jdouble);
+  virtual jboolean contains(jdouble, jdouble);
+  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
+  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
+  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
+  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
+  static const jint OPEN = 0;
+  static const jint CHORD = 1;
+  static const jint PIE = 2;
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::java::awt::geom::RectangularShape)))) type;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Arc2D__
diff --git a/libjava/java/awt/geom/Area$AreaIterator$IteratorSegment.h b/libjava/java/awt/geom/Area$AreaIterator$IteratorSegment.h
new file mode 100644
index 000000000..2dfcf311e
--- /dev/null
+++ b/libjava/java/awt/geom/Area$AreaIterator$IteratorSegment.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Area$AreaIterator$IteratorSegment__
+#define __java_awt_geom_Area$AreaIterator$IteratorSegment__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class Area$AreaIterator;
+          class Area$AreaIterator$IteratorSegment;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Area$AreaIterator$IteratorSegment : public ::java::lang::Object
+{
+
+public: // actually package-private
+  Area$AreaIterator$IteratorSegment(::java::awt::geom::Area$AreaIterator *);
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
+  JArray< jdouble > * coords;
+  ::java::awt::geom::Area$AreaIterator * this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Area$AreaIterator$IteratorSegment__
diff --git a/libjava/java/awt/geom/Area$AreaIterator.h b/libjava/java/awt/geom/Area$AreaIterator.h
new file mode 100644
index 000000000..86824256a
--- /dev/null
+++ b/libjava/java/awt/geom/Area$AreaIterator.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Area$AreaIterator__
+#define __java_awt_geom_Area$AreaIterator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class AffineTransform;
+          class Area;
+          class Area$AreaIterator;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Area$AreaIterator : public ::java::lang::Object
+{
+
+public:
+  Area$AreaIterator(::java::awt::geom::Area *, ::java::awt::geom::AffineTransform *);
+  virtual jint currentSegment(JArray< jdouble > *);
+  virtual jint currentSegment(JArray< jfloat > *);
+  virtual jint getWindingRule();
+  virtual jboolean isDone();
+  virtual void next();
+private:
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) segments;
+  jint index;
+  ::java::awt::geom::AffineTransform * at;
+public: // actually package-private
+  ::java::awt::geom::Area * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Area$AreaIterator__
diff --git a/libjava/java/awt/geom/Area$CubicSegment.h b/libjava/java/awt/geom/Area$CubicSegment.h
new file mode 100644
index 000000000..f5a31385e
--- /dev/null
+++ b/libjava/java/awt/geom/Area$CubicSegment.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Area$CubicSegment__
+#define __java_awt_geom_Area$CubicSegment__
+
+#pragma interface
+
+#include <java/awt/geom/Area$Segment.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class AffineTransform;
+          class Area;
+          class Area$CubicSegment;
+          class Area$Segment;
+          class CubicCurve2D;
+          class Point2D;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Area$CubicSegment : public ::java::awt::geom::Area$Segment
+{
+
+public:
+  Area$CubicSegment(::java::awt::geom::Area *, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  virtual ::java::lang::Object * clone();
+public: // actually package-private
+  virtual jdouble curveArea();
+  virtual jboolean equals(::java::awt::geom::Area$Segment *);
+  virtual ::java::awt::geom::Point2D * evaluatePoint(jdouble);
+  virtual ::java::awt::geom::Rectangle2D * getBounds();
+  virtual ::java::awt::geom::CubicCurve2D * getCubicCurve2D();
+  virtual JArray< jdouble > * getLoop();
+  virtual ::java::awt::geom::Point2D * getMidPoint();
+  virtual jint getType();
+  virtual jint pathIteratorFormat(JArray< jdouble > *);
+  virtual jint rayCrossing(jdouble, jdouble);
+  virtual void reverseCoords();
+  virtual jint splitIntersections(::java::awt::geom::Area$Segment *);
+  virtual void subdivideInsert(jdouble);
+  virtual void transform(::java::awt::geom::AffineTransform *);
+  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::java::awt::geom::Area$Segment)))) cp1;
+  ::java::awt::geom::Point2D * cp2;
+  ::java::awt::geom::Area * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Area$CubicSegment__
diff --git a/libjava/java/awt/geom/Area$Intersection.h b/libjava/java/awt/geom/Area$Intersection.h
new file mode 100644
index 000000000..c4c716286
--- /dev/null
+++ b/libjava/java/awt/geom/Area$Intersection.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Area$Intersection__
+#define __java_awt_geom_Area$Intersection__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class Area;
+          class Area$Intersection;
+          class Area$Segment;
+          class Point2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Area$Intersection : public ::java::lang::Object
+{
+
+public:
+  Area$Intersection(::java::awt::geom::Area *, ::java::awt::geom::Point2D *, jdouble, jdouble);
+public: // actually package-private
+  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::java::lang::Object)))) p;
+  jdouble ta;
+  jdouble tb;
+  ::java::awt::geom::Area$Segment * seg;
+  ::java::awt::geom::Area * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Area$Intersection__
diff --git a/libjava/java/awt/geom/Area$LineSegment.h b/libjava/java/awt/geom/Area$LineSegment.h
new file mode 100644
index 000000000..2eb0692a8
--- /dev/null
+++ b/libjava/java/awt/geom/Area$LineSegment.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Area$LineSegment__
+#define __java_awt_geom_Area$LineSegment__
+
+#pragma interface
+
+#include <java/awt/geom/Area$Segment.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class AffineTransform;
+          class Area;
+          class Area$LineSegment;
+          class Area$Segment;
+          class Point2D;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Area$LineSegment : public ::java::awt::geom::Area$Segment
+{
+
+public:
+  Area$LineSegment(::java::awt::geom::Area *, jdouble, jdouble, jdouble, jdouble);
+  Area$LineSegment(::java::awt::geom::Area *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
+  virtual ::java::lang::Object * clone();
+public: // actually package-private
+  virtual void transform(::java::awt::geom::AffineTransform *);
+  virtual void reverseCoords();
+  virtual ::java::awt::geom::Point2D * getMidPoint();
+  virtual jdouble curveArea();
+  virtual jint getType();
+  virtual void subdivideInsert(jdouble);
+  virtual jboolean isCoLinear(::java::awt::geom::Area$LineSegment *);
+  virtual ::java::awt::geom::Area$Segment * lastCoLinear();
+  virtual jboolean equals(::java::awt::geom::Area$Segment *);
+  virtual jint pathIteratorFormat(JArray< jdouble > *);
+  virtual jboolean hasIntersections(::java::awt::geom::Area$Segment *);
+  virtual jint splitIntersections(::java::awt::geom::Area$Segment *);
+  virtual ::java::awt::geom::Rectangle2D * getBounds();
+  virtual jint rayCrossing(jdouble, jdouble);
+  ::java::awt::geom::Area * __attribute__((aligned(__alignof__( ::java::awt::geom::Area$Segment)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Area$LineSegment__
diff --git a/libjava/java/awt/geom/Area$QuadSegment.h b/libjava/java/awt/geom/Area$QuadSegment.h
new file mode 100644
index 000000000..ca6dc99c5
--- /dev/null
+++ b/libjava/java/awt/geom/Area$QuadSegment.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Area$QuadSegment__
+#define __java_awt_geom_Area$QuadSegment__
+
+#pragma interface
+
+#include <java/awt/geom/Area$Segment.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class AffineTransform;
+          class Area;
+          class Area$CubicSegment;
+          class Area$QuadSegment;
+          class Area$Segment;
+          class Point2D;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Area$QuadSegment : public ::java::awt::geom::Area$Segment
+{
+
+public: // actually package-private
+  Area$QuadSegment(::java::awt::geom::Area *, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+public:
+  virtual ::java::lang::Object * clone();
+public: // actually package-private
+  virtual jdouble curveArea();
+  virtual jboolean equals(::java::awt::geom::Area$Segment *);
+  virtual ::java::awt::geom::Point2D * evaluatePoint(jdouble);
+  virtual ::java::awt::geom::Rectangle2D * getBounds();
+  virtual ::java::awt::geom::Area$CubicSegment * getCubicSegment();
+  virtual ::java::awt::geom::Point2D * getMidPoint();
+  virtual jint getType();
+  virtual jint pathIteratorFormat(JArray< jdouble > *);
+  virtual jint rayCrossing(jdouble, jdouble);
+  virtual void reverseCoords();
+  virtual jint splitIntersections(::java::awt::geom::Area$Segment *);
+  virtual void subdivideInsert(jdouble);
+  virtual void transform(::java::awt::geom::AffineTransform *);
+  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::java::awt::geom::Area$Segment)))) cp;
+  ::java::awt::geom::Area * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Area$QuadSegment__
diff --git a/libjava/java/awt/geom/Area$Segment.h b/libjava/java/awt/geom/Area$Segment.h
new file mode 100644
index 000000000..866ecefdd
--- /dev/null
+++ b/libjava/java/awt/geom/Area$Segment.h
@@ -0,0 +1,76 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Area$Segment__
+#define __java_awt_geom_Area$Segment__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Shape;
+      namespace geom
+      {
+          class AffineTransform;
+          class Area;
+          class Area$Intersection;
+          class Area$Segment;
+          class Point2D;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Area$Segment : public ::java::lang::Object
+{
+
+public: // actually package-private
+  Area$Segment(::java::awt::geom::Area *);
+  virtual void reverseCoords() = 0;
+  virtual ::java::awt::geom::Point2D * getMidPoint() = 0;
+  virtual ::java::awt::geom::Rectangle2D * getBounds() = 0;
+  virtual void transform(::java::awt::geom::AffineTransform *) = 0;
+  virtual jint getType() = 0;
+  virtual jint splitIntersections(::java::awt::geom::Area$Segment *) = 0;
+  virtual jint pathIteratorFormat(JArray< jdouble > *) = 0;
+  virtual jint rayCrossing(jdouble, jdouble) = 0;
+  virtual void subdivideInsert(jdouble) = 0;
+  virtual jdouble curveArea() = 0;
+  virtual jboolean equals(::java::awt::geom::Area$Segment *) = 0;
+  virtual jboolean contains(jdouble, jdouble);
+  virtual void nullNodes();
+  virtual void transformSegmentList(::java::awt::geom::AffineTransform *);
+  virtual jboolean hasClockwiseOrientation();
+public:
+  virtual ::java::awt::geom::Rectangle2D * getPathBounds();
+public: // actually package-private
+  virtual jdouble getSignedArea();
+  virtual void reverseAll();
+  virtual void insert(::java::awt::geom::Area$Segment *);
+  virtual jboolean isPolygonal();
+  virtual ::java::awt::geom::Area$Segment * cloneSegmentList();
+  virtual jint createNode(::java::awt::geom::Area$Segment *, ::java::awt::geom::Area$Intersection *);
+public: // actually protected
+  virtual jint createNodes(::java::awt::geom::Area$Segment *, JArray< ::java::awt::geom::Area$Intersection * > *);
+public: // actually package-private
+  virtual jboolean pathEquals(::java::awt::geom::Area$Segment *);
+  virtual ::java::awt::geom::Area$Segment * getTopLeft();
+  virtual jboolean isSegmentOutside(::java::awt::Shape *);
+  ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::java::lang::Object)))) P1;
+  ::java::awt::geom::Point2D * P2;
+  ::java::awt::geom::Area$Segment * next;
+  ::java::awt::geom::Area$Segment * node;
+  ::java::awt::geom::Area * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Area$Segment__
diff --git a/libjava/java/awt/geom/Area.h b/libjava/java/awt/geom/Area.h
new file mode 100644
index 000000000..47a87df4e
--- /dev/null
+++ b/libjava/java/awt/geom/Area.h
@@ -0,0 +1,96 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Area__
+#define __java_awt_geom_Area__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+        class Shape;
+      namespace geom
+      {
+          class AffineTransform;
+          class Area;
+          class Area$CubicSegment;
+          class Area$Intersection;
+          class Area$LineSegment;
+          class Area$QuadSegment;
+          class Area$Segment;
+          class CubicCurve2D;
+          class PathIterator;
+          class Point2D;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Area : public ::java::lang::Object
+{
+
+public:
+  Area();
+  Area(::java::awt::Shape *);
+  virtual void add(::java::awt::geom::Area *);
+  virtual void subtract(::java::awt::geom::Area *);
+  virtual void intersect(::java::awt::geom::Area *);
+  virtual void exclusiveOr(::java::awt::geom::Area *);
+  virtual void reset();
+  virtual jboolean isEmpty();
+  virtual jboolean isPolygonal();
+  virtual jboolean isRectangular();
+  virtual jboolean isSingular();
+  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
+  virtual ::java::awt::Rectangle * getBounds();
+  virtual ::java::lang::Object * clone();
+  virtual jboolean equals(::java::awt::geom::Area *);
+  virtual void transform(::java::awt::geom::AffineTransform *);
+  virtual ::java::awt::geom::Area * createTransformedArea(::java::awt::geom::AffineTransform *);
+  virtual jboolean contains(jdouble, jdouble);
+  virtual jboolean contains(::java::awt::geom::Point2D *);
+  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
+  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
+  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
+  virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
+  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
+  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
+private:
+  ::java::util::Vector * weilerAtherton(::java::util::Vector *);
+  jint getRecursionDepth(::java::awt::geom::Area$CubicSegment *);
+  void recursiveSubdivide(::java::awt::geom::CubicCurve2D *, ::java::awt::geom::CubicCurve2D *, jint, jint, jdouble, jdouble, jdouble, jdouble);
+public: // actually package-private
+  virtual JArray< ::java::awt::geom::Area$Intersection * > * cubicCubicIntersect(::java::awt::geom::Area$CubicSegment *, ::java::awt::geom::Area$CubicSegment *);
+  virtual JArray< ::java::awt::geom::Area$Intersection * > * lineQuadIntersect(::java::awt::geom::Area$LineSegment *, ::java::awt::geom::Area$QuadSegment *);
+  virtual JArray< ::java::awt::geom::Area$Intersection * > * lineCubicIntersect(::java::awt::geom::Area$LineSegment *, ::java::awt::geom::Area$CubicSegment *);
+  virtual ::java::awt::geom::Area$Intersection * linesIntersect(::java::awt::geom::Area$LineSegment *, ::java::awt::geom::Area$LineSegment *);
+  virtual jboolean pointEquals(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
+private:
+  ::java::util::Vector * makeSegment(::java::awt::Shape *);
+  jint createNodes(::java::awt::geom::Area$Segment *, ::java::awt::geom::Area$Segment *);
+  jint createNodesSelf(::java::awt::geom::Area$Segment *);
+  void deleteRedundantPaths(::java::util::Vector *);
+  void setDirection(::java::util::Vector *, jboolean);
+  static jdouble EPSILON;
+  static jdouble RS_EPSILON;
+  static jdouble PE_EPSILON;
+public: // actually package-private
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) solids;
+  ::java::util::Vector * holes;
+private:
+  ::java::util::Vector * cc_intersections;
+  jint windingRule;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Area__
diff --git a/libjava/java/awt/geom/CubicCurve2D$1.h b/libjava/java/awt/geom/CubicCurve2D$1.h
new file mode 100644
index 000000000..960807e7d
--- /dev/null
+++ b/libjava/java/awt/geom/CubicCurve2D$1.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_CubicCurve2D$1__
+#define __java_awt_geom_CubicCurve2D$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class AffineTransform;
+          class CubicCurve2D;
+          class CubicCurve2D$1;
+      }
+    }
+  }
+}
+
+class java::awt::geom::CubicCurve2D$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  CubicCurve2D$1(::java::awt::geom::CubicCurve2D *, ::java::awt::geom::AffineTransform *);
+public:
+  virtual jint getWindingRule();
+  virtual jboolean isDone();
+  virtual void next();
+  virtual jint currentSegment(JArray< jfloat > *);
+  virtual jint currentSegment(JArray< jdouble > *);
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
+public: // actually package-private
+  ::java::awt::geom::CubicCurve2D * this$0;
+private:
+  ::java::awt::geom::AffineTransform * val$at;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_CubicCurve2D$1__
diff --git a/libjava/java/awt/geom/CubicCurve2D$Double.h b/libjava/java/awt/geom/CubicCurve2D$Double.h
new file mode 100644
index 000000000..d3d47429c
--- /dev/null
+++ b/libjava/java/awt/geom/CubicCurve2D$Double.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_CubicCurve2D$Double__
+#define __java_awt_geom_CubicCurve2D$Double__
+
+#pragma interface
+
+#include <java/awt/geom/CubicCurve2D.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class CubicCurve2D$Double;
+          class Point2D;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::CubicCurve2D$Double : public ::java::awt::geom::CubicCurve2D
+{
+
+public:
+  CubicCurve2D$Double();
+  CubicCurve2D$Double(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  virtual jdouble getX1();
+  virtual jdouble getY1();
+  virtual ::java::awt::geom::Point2D * getP1();
+  virtual jdouble getCtrlX1();
+  virtual jdouble getCtrlY1();
+  virtual ::java::awt::geom::Point2D * getCtrlP1();
+  virtual jdouble getCtrlX2();
+  virtual jdouble getCtrlY2();
+  virtual ::java::awt::geom::Point2D * getCtrlP2();
+  virtual jdouble getX2();
+  virtual jdouble getY2();
+  virtual ::java::awt::geom::Point2D * getP2();
+  virtual void setCurve(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
+  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::CubicCurve2D)))) x1;
+  jdouble y1;
+  jdouble ctrlx1;
+  jdouble ctrly1;
+  jdouble ctrlx2;
+  jdouble ctrly2;
+  jdouble x2;
+  jdouble y2;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_CubicCurve2D$Double__
diff --git a/libjava/java/awt/geom/CubicCurve2D$Float.h b/libjava/java/awt/geom/CubicCurve2D$Float.h
new file mode 100644
index 000000000..6e6cd4d2c
--- /dev/null
+++ b/libjava/java/awt/geom/CubicCurve2D$Float.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_CubicCurve2D$Float__
+#define __java_awt_geom_CubicCurve2D$Float__
+
+#pragma interface
+
+#include <java/awt/geom/CubicCurve2D.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class CubicCurve2D$Float;
+          class Point2D;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::CubicCurve2D$Float : public ::java::awt::geom::CubicCurve2D
+{
+
+public:
+  CubicCurve2D$Float();
+  CubicCurve2D$Float(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
+  virtual jdouble getX1();
+  virtual jdouble getY1();
+  virtual ::java::awt::geom::Point2D * getP1();
+  virtual jdouble getCtrlX1();
+  virtual jdouble getCtrlY1();
+  virtual ::java::awt::geom::Point2D * getCtrlP1();
+  virtual jdouble getCtrlX2();
+  virtual jdouble getCtrlY2();
+  virtual ::java::awt::geom::Point2D * getCtrlP2();
+  virtual jdouble getX2();
+  virtual jdouble getY2();
+  virtual ::java::awt::geom::Point2D * getP2();
+  virtual void setCurve(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  virtual void setCurve(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
+  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
+  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::CubicCurve2D)))) x1;
+  jfloat y1;
+  jfloat ctrlx1;
+  jfloat ctrly1;
+  jfloat ctrlx2;
+  jfloat ctrly2;
+  jfloat x2;
+  jfloat y2;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_CubicCurve2D$Float__
diff --git a/libjava/java/awt/geom/CubicCurve2D.h b/libjava/java/awt/geom/CubicCurve2D.h
new file mode 100644
index 000000000..f9f82b894
--- /dev/null
+++ b/libjava/java/awt/geom/CubicCurve2D.h
@@ -0,0 +1,86 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_CubicCurve2D__
+#define __java_awt_geom_CubicCurve2D__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+      namespace geom
+      {
+          class AffineTransform;
+          class CubicCurve2D;
+          class PathIterator;
+          class Point2D;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::CubicCurve2D : public ::java::lang::Object
+{
+
+public: // actually protected
+  CubicCurve2D();
+public:
+  virtual jdouble getX1() = 0;
+  virtual jdouble getY1() = 0;
+  virtual ::java::awt::geom::Point2D * getP1() = 0;
+  virtual jdouble getCtrlX1() = 0;
+  virtual jdouble getCtrlY1() = 0;
+  virtual ::java::awt::geom::Point2D * getCtrlP1() = 0;
+  virtual jdouble getCtrlX2() = 0;
+  virtual jdouble getCtrlY2() = 0;
+  virtual ::java::awt::geom::Point2D * getCtrlP2() = 0;
+  virtual jdouble getX2() = 0;
+  virtual jdouble getY2() = 0;
+  virtual ::java::awt::geom::Point2D * getP2() = 0;
+  virtual void setCurve(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble) = 0;
+  virtual void setCurve(JArray< jdouble > *, jint);
+  virtual void setCurve(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
+  virtual void setCurve(JArray< ::java::awt::geom::Point2D * > *, jint);
+  virtual void setCurve(::java::awt::geom::CubicCurve2D *);
+  static jdouble getFlatnessSq(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  static jdouble getFlatness(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  static jdouble getFlatnessSq(JArray< jdouble > *, jint);
+  static jdouble getFlatness(JArray< jdouble > *, jint);
+  virtual jdouble getFlatnessSq();
+  virtual jdouble getFlatness();
+  virtual void subdivide(::java::awt::geom::CubicCurve2D *, ::java::awt::geom::CubicCurve2D *);
+  static void subdivide(::java::awt::geom::CubicCurve2D *, ::java::awt::geom::CubicCurve2D *, ::java::awt::geom::CubicCurve2D *);
+  static void subdivide(JArray< jdouble > *, jint, JArray< jdouble > *, jint, JArray< jdouble > *, jint);
+  static jint solveCubic(JArray< jdouble > *);
+  static jint solveCubic(JArray< jdouble > *, JArray< jdouble > *);
+  virtual jboolean contains(jdouble, jdouble);
+  virtual jboolean contains(::java::awt::geom::Point2D *);
+  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
+  virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
+  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
+  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
+  virtual ::java::awt::Rectangle * getBounds();
+  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
+  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
+  virtual ::java::lang::Object * clone();
+private:
+  jint getAxisIntersections(jdouble, jdouble, jboolean, jdouble);
+public:
+  virtual ::java::awt::geom::Rectangle2D * getBounds2D() = 0;
+private:
+  static jdouble BIG_VALUE;
+  static jdouble EPSILON;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_CubicCurve2D__
diff --git a/libjava/java/awt/geom/Dimension2D.h b/libjava/java/awt/geom/Dimension2D.h
new file mode 100644
index 000000000..d201d7a5f
--- /dev/null
+++ b/libjava/java/awt/geom/Dimension2D.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Dimension2D__
+#define __java_awt_geom_Dimension2D__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class Dimension2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Dimension2D : public ::java::lang::Object
+{
+
+public: // actually protected
+  Dimension2D();
+public:
+  virtual jdouble getWidth() = 0;
+  virtual jdouble getHeight() = 0;
+  virtual void setSize(jdouble, jdouble) = 0;
+  virtual void setSize(::java::awt::geom::Dimension2D *);
+  virtual ::java::lang::Object * clone();
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Dimension2D__
diff --git a/libjava/java/awt/geom/Ellipse2D$Double.h b/libjava/java/awt/geom/Ellipse2D$Double.h
new file mode 100644
index 000000000..06b28e6f3
--- /dev/null
+++ b/libjava/java/awt/geom/Ellipse2D$Double.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Ellipse2D$Double__
+#define __java_awt_geom_Ellipse2D$Double__
+
+#pragma interface
+
+#include <java/awt/geom/Ellipse2D.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class Ellipse2D$Double;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Ellipse2D$Double : public ::java::awt::geom::Ellipse2D
+{
+
+public:
+  Ellipse2D$Double();
+  Ellipse2D$Double(jdouble, jdouble, jdouble, jdouble);
+  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
+  virtual jdouble getHeight();
+  virtual jdouble getWidth();
+  virtual jdouble getX();
+  virtual jdouble getY();
+  virtual jboolean isEmpty();
+  virtual void setFrame(jdouble, jdouble, jdouble, jdouble);
+  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::Ellipse2D)))) height;
+  jdouble width;
+  jdouble x;
+  jdouble y;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Ellipse2D$Double__
diff --git a/libjava/java/awt/geom/Ellipse2D$Float.h b/libjava/java/awt/geom/Ellipse2D$Float.h
new file mode 100644
index 000000000..52177dc02
--- /dev/null
+++ b/libjava/java/awt/geom/Ellipse2D$Float.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Ellipse2D$Float__
+#define __java_awt_geom_Ellipse2D$Float__
+
+#pragma interface
+
+#include <java/awt/geom/Ellipse2D.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class Ellipse2D$Float;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Ellipse2D$Float : public ::java::awt::geom::Ellipse2D
+{
+
+public:
+  Ellipse2D$Float();
+  Ellipse2D$Float(jfloat, jfloat, jfloat, jfloat);
+  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
+  virtual jdouble getHeight();
+  virtual jdouble getWidth();
+  virtual jdouble getX();
+  virtual jdouble getY();
+  virtual jboolean isEmpty();
+  virtual void setFrame(jfloat, jfloat, jfloat, jfloat);
+  virtual void setFrame(jdouble, jdouble, jdouble, jdouble);
+  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::Ellipse2D)))) height;
+  jfloat width;
+  jfloat x;
+  jfloat y;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Ellipse2D$Float__
diff --git a/libjava/java/awt/geom/Ellipse2D.h b/libjava/java/awt/geom/Ellipse2D.h
new file mode 100644
index 000000000..a78c318d8
--- /dev/null
+++ b/libjava/java/awt/geom/Ellipse2D.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Ellipse2D__
+#define __java_awt_geom_Ellipse2D__
+
+#pragma interface
+
+#include <java/awt/geom/RectangularShape.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class AffineTransform;
+          class Ellipse2D;
+          class PathIterator;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Ellipse2D : public ::java::awt::geom::RectangularShape
+{
+
+public: // actually protected
+  Ellipse2D();
+public:
+  virtual jboolean contains(jdouble, jdouble);
+  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
+  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
+  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Ellipse2D__
diff --git a/libjava/java/awt/geom/FlatteningPathIterator.h b/libjava/java/awt/geom/FlatteningPathIterator.h
new file mode 100644
index 000000000..7936286da
--- /dev/null
+++ b/libjava/java/awt/geom/FlatteningPathIterator.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_FlatteningPathIterator__
+#define __java_awt_geom_FlatteningPathIterator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class FlatteningPathIterator;
+          class PathIterator;
+      }
+    }
+  }
+}
+
+class java::awt::geom::FlatteningPathIterator : public ::java::lang::Object
+{
+
+public:
+  FlatteningPathIterator(::java::awt::geom::PathIterator *, jdouble);
+  FlatteningPathIterator(::java::awt::geom::PathIterator *, jdouble, jint);
+  virtual jdouble getFlatness();
+  virtual jint getRecursionLimit();
+  virtual jint getWindingRule();
+  virtual jboolean isDone();
+  virtual void next();
+  virtual jint currentSegment(JArray< jdouble > *);
+  virtual jint currentSegment(JArray< jfloat > *);
+private:
+  void fetchSegment();
+  void subdivideQuadratic();
+  void subdivideCubic();
+  ::java::awt::geom::PathIterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) srcIter;
+  jdouble flatnessSq;
+  jint recursionLimit;
+  JArray< jdouble > * stack;
+  jint stackSize;
+  JArray< jint > * recLevel;
+  JArray< jdouble > * scratch;
+  jint srcSegType;
+  jdouble srcPosX;
+  jdouble srcPosY;
+  jboolean done;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_FlatteningPathIterator__
diff --git a/libjava/java/awt/geom/GeneralPath$GeneralPathIterator.h b/libjava/java/awt/geom/GeneralPath$GeneralPathIterator.h
new file mode 100644
index 000000000..9bf63bd5f
--- /dev/null
+++ b/libjava/java/awt/geom/GeneralPath$GeneralPathIterator.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_GeneralPath$GeneralPathIterator__
+#define __java_awt_geom_GeneralPath$GeneralPathIterator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class AffineTransform;
+          class GeneralPath;
+          class GeneralPath$GeneralPathIterator;
+      }
+    }
+  }
+}
+
+class java::awt::geom::GeneralPath$GeneralPathIterator : public ::java::lang::Object
+{
+
+public: // actually package-private
+  GeneralPath$GeneralPathIterator(::java::awt::geom::GeneralPath *, ::java::awt::geom::AffineTransform *);
+public:
+  virtual jint getWindingRule();
+  virtual jboolean isDone();
+  virtual void next();
+  virtual jint currentSegment(JArray< jfloat > *);
+  virtual jint currentSegment(JArray< jdouble > *);
+private:
+  static JArray< jint > * NUM_COORDS;
+public: // actually package-private
+  ::java::awt::geom::GeneralPath * __attribute__((aligned(__alignof__( ::java::lang::Object)))) path;
+private:
+  ::java::awt::geom::AffineTransform * transform;
+  jint pos;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_GeneralPath$GeneralPathIterator__
diff --git a/libjava/java/awt/geom/GeneralPath.h b/libjava/java/awt/geom/GeneralPath.h
new file mode 100644
index 000000000..a2d37c73f
--- /dev/null
+++ b/libjava/java/awt/geom/GeneralPath.h
@@ -0,0 +1,88 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_GeneralPath__
+#define __java_awt_geom_GeneralPath__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+        class Shape;
+      namespace geom
+      {
+          class AffineTransform;
+          class GeneralPath;
+          class PathIterator;
+          class Point2D;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::GeneralPath : public ::java::lang::Object
+{
+
+public:
+  GeneralPath();
+  GeneralPath(jint);
+  GeneralPath(jint, jint);
+  GeneralPath(::java::awt::Shape *);
+  void moveTo(jfloat, jfloat);
+  void lineTo(jfloat, jfloat);
+  void quadTo(jfloat, jfloat, jfloat, jfloat);
+  void curveTo(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
+  void closePath();
+  void append(::java::awt::Shape *, jboolean);
+  void append(::java::awt::geom::PathIterator *, jboolean);
+  jint getWindingRule();
+  void setWindingRule(jint);
+  ::java::awt::geom::Point2D * getCurrentPoint();
+  void reset();
+  void transform(::java::awt::geom::AffineTransform *);
+  ::java::awt::Shape * createTransformedShape(::java::awt::geom::AffineTransform *);
+  ::java::awt::Rectangle * getBounds();
+  ::java::awt::geom::Rectangle2D * getBounds2D();
+  jboolean contains(jdouble, jdouble);
+  jboolean contains(::java::awt::geom::Point2D *);
+  jboolean contains(jdouble, jdouble, jdouble, jdouble);
+  jboolean contains(::java::awt::geom::Rectangle2D *);
+  jboolean intersects(jdouble, jdouble, jdouble, jdouble);
+  jboolean intersects(::java::awt::geom::Rectangle2D *);
+  ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
+  ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
+  ::java::lang::Object * clone();
+private:
+  void ensureSize(jint);
+  jint getAxisIntersections(jdouble, jdouble, jboolean, jdouble);
+  jint getWindingNumber(jdouble, jdouble);
+  jint evaluateCrossings(jdouble, jdouble, jboolean, jboolean, jdouble);
+public:
+  static const jint WIND_EVEN_ODD = 0;
+  static const jint WIND_NON_ZERO = 1;
+private:
+  static const jint INIT_SIZE = 10;
+  static jdouble BIG_VALUE;
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) rule;
+  JArray< jbyte > * types;
+  JArray< jfloat > * xpoints;
+  JArray< jfloat > * ypoints;
+private:
+  jint subpath;
+public: // actually package-private
+  jint index;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_GeneralPath__
diff --git a/libjava/java/awt/geom/IllegalPathStateException.h b/libjava/java/awt/geom/IllegalPathStateException.h
new file mode 100644
index 000000000..4147334fd
--- /dev/null
+++ b/libjava/java/awt/geom/IllegalPathStateException.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_IllegalPathStateException__
+#define __java_awt_geom_IllegalPathStateException__
+
+#pragma interface
+
+#include <java/lang/RuntimeException.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class IllegalPathStateException;
+      }
+    }
+  }
+}
+
+class java::awt::geom::IllegalPathStateException : public ::java::lang::RuntimeException
+{
+
+public:
+  IllegalPathStateException();
+  IllegalPathStateException(::java::lang::String *);
+private:
+  static const jlong serialVersionUID = -5158084205220481094LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_IllegalPathStateException__
diff --git a/libjava/java/awt/geom/Line2D$1.h b/libjava/java/awt/geom/Line2D$1.h
new file mode 100644
index 000000000..236ed0c96
--- /dev/null
+++ b/libjava/java/awt/geom/Line2D$1.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Line2D$1__
+#define __java_awt_geom_Line2D$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class AffineTransform;
+          class Line2D;
+          class Line2D$1;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Line2D$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  Line2D$1(::java::awt::geom::Line2D *, ::java::awt::geom::AffineTransform *);
+public:
+  virtual jint getWindingRule();
+  virtual jboolean isDone();
+  virtual void next();
+  virtual jint currentSegment(JArray< jfloat > *);
+  virtual jint currentSegment(JArray< jdouble > *);
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
+public: // actually package-private
+  ::java::awt::geom::Line2D * this$0;
+private:
+  ::java::awt::geom::AffineTransform * val$at;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Line2D$1__
diff --git a/libjava/java/awt/geom/Line2D$Double.h b/libjava/java/awt/geom/Line2D$Double.h
new file mode 100644
index 000000000..a9915b73d
--- /dev/null
+++ b/libjava/java/awt/geom/Line2D$Double.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Line2D$Double__
+#define __java_awt_geom_Line2D$Double__
+
+#pragma interface
+
+#include <java/awt/geom/Line2D.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class Line2D$Double;
+          class Point2D;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Line2D$Double : public ::java::awt::geom::Line2D
+{
+
+public:
+  Line2D$Double();
+  Line2D$Double(jdouble, jdouble, jdouble, jdouble);
+  Line2D$Double(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
+  virtual jdouble getX1();
+  virtual jdouble getY1();
+  virtual ::java::awt::geom::Point2D * getP1();
+  virtual jdouble getX2();
+  virtual jdouble getY2();
+  virtual ::java::awt::geom::Point2D * getP2();
+  virtual void setLine(jdouble, jdouble, jdouble, jdouble);
+  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
+  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::Line2D)))) x1;
+  jdouble y1;
+  jdouble x2;
+  jdouble y2;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Line2D$Double__
diff --git a/libjava/java/awt/geom/Line2D$Float.h b/libjava/java/awt/geom/Line2D$Float.h
new file mode 100644
index 000000000..1a829e2c6
--- /dev/null
+++ b/libjava/java/awt/geom/Line2D$Float.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Line2D$Float__
+#define __java_awt_geom_Line2D$Float__
+
+#pragma interface
+
+#include <java/awt/geom/Line2D.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class Line2D$Float;
+          class Point2D;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Line2D$Float : public ::java::awt::geom::Line2D
+{
+
+public:
+  Line2D$Float();
+  Line2D$Float(jfloat, jfloat, jfloat, jfloat);
+  Line2D$Float(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
+  virtual jdouble getX1();
+  virtual jdouble getY1();
+  virtual ::java::awt::geom::Point2D * getP1();
+  virtual jdouble getX2();
+  virtual jdouble getY2();
+  virtual ::java::awt::geom::Point2D * getP2();
+  virtual void setLine(jdouble, jdouble, jdouble, jdouble);
+  virtual void setLine(jfloat, jfloat, jfloat, jfloat);
+  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
+  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::Line2D)))) x1;
+  jfloat y1;
+  jfloat x2;
+  jfloat y2;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Line2D$Float__
diff --git a/libjava/java/awt/geom/Line2D.h b/libjava/java/awt/geom/Line2D.h
new file mode 100644
index 000000000..5310eadc7
--- /dev/null
+++ b/libjava/java/awt/geom/Line2D.h
@@ -0,0 +1,80 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Line2D__
+#define __java_awt_geom_Line2D__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+      namespace geom
+      {
+          class AffineTransform;
+          class Line2D;
+          class PathIterator;
+          class Point2D;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Line2D : public ::java::lang::Object
+{
+
+public: // actually protected
+  Line2D();
+public:
+  virtual jdouble getX1() = 0;
+  virtual jdouble getY1() = 0;
+  virtual ::java::awt::geom::Point2D * getP1() = 0;
+  virtual jdouble getX2() = 0;
+  virtual jdouble getY2() = 0;
+  virtual ::java::awt::geom::Point2D * getP2() = 0;
+  virtual void setLine(jdouble, jdouble, jdouble, jdouble) = 0;
+  virtual void setLine(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
+  virtual void setLine(::java::awt::geom::Line2D *);
+  static jint relativeCCW(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  virtual jint relativeCCW(jdouble, jdouble);
+  virtual jint relativeCCW(::java::awt::geom::Point2D *);
+private:
+  static jdouble area2(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  static jboolean between(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+public:
+  static jboolean linesIntersect(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  virtual jboolean intersectsLine(jdouble, jdouble, jdouble, jdouble);
+  virtual jboolean intersectsLine(::java::awt::geom::Line2D *);
+  static jdouble ptSegDistSq(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  static jdouble ptSegDist(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  virtual jdouble ptSegDistSq(jdouble, jdouble);
+  virtual jdouble ptSegDistSq(::java::awt::geom::Point2D *);
+  virtual jdouble ptSegDist(jdouble, jdouble);
+  virtual jdouble ptSegDist(::java::awt::geom::Point2D *);
+  static jdouble ptLineDistSq(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  static jdouble ptLineDist(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  virtual jdouble ptLineDistSq(jdouble, jdouble);
+  virtual jdouble ptLineDistSq(::java::awt::geom::Point2D *);
+  virtual jdouble ptLineDist(jdouble, jdouble);
+  virtual jdouble ptLineDist(::java::awt::geom::Point2D *);
+  virtual jboolean contains(jdouble, jdouble);
+  virtual jboolean contains(::java::awt::geom::Point2D *);
+  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
+  virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
+  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
+  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
+  virtual ::java::awt::Rectangle * getBounds();
+  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
+  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
+  virtual ::java::lang::Object * clone();
+  virtual ::java::awt::geom::Rectangle2D * getBounds2D() = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Line2D__
diff --git a/libjava/java/awt/geom/NoninvertibleTransformException.h b/libjava/java/awt/geom/NoninvertibleTransformException.h
new file mode 100644
index 000000000..1e7b71249
--- /dev/null
+++ b/libjava/java/awt/geom/NoninvertibleTransformException.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_NoninvertibleTransformException__
+#define __java_awt_geom_NoninvertibleTransformException__
+
+#pragma interface
+
+#include <java/lang/Exception.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class NoninvertibleTransformException;
+      }
+    }
+  }
+}
+
+class java::awt::geom::NoninvertibleTransformException : public ::java::lang::Exception
+{
+
+public:
+  NoninvertibleTransformException(::java::lang::String *);
+private:
+  static const jlong serialVersionUID = 6137225240503990466LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_NoninvertibleTransformException__
diff --git a/libjava/java/awt/geom/PathIterator.h b/libjava/java/awt/geom/PathIterator.h
new file mode 100644
index 000000000..a201f5604
--- /dev/null
+++ b/libjava/java/awt/geom/PathIterator.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_PathIterator__
+#define __java_awt_geom_PathIterator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class PathIterator;
+      }
+    }
+  }
+}
+
+class java::awt::geom::PathIterator : public ::java::lang::Object
+{
+
+public:
+  virtual jint getWindingRule() = 0;
+  virtual jboolean isDone() = 0;
+  virtual void next() = 0;
+  virtual jint currentSegment(JArray< jfloat > *) = 0;
+  virtual jint currentSegment(JArray< jdouble > *) = 0;
+  static const jint WIND_EVEN_ODD = 0;
+  static const jint WIND_NON_ZERO = 1;
+  static const jint SEG_MOVETO = 0;
+  static const jint SEG_LINETO = 1;
+  static const jint SEG_QUADTO = 2;
+  static const jint SEG_CUBICTO = 3;
+  static const jint SEG_CLOSE = 4;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __java_awt_geom_PathIterator__
diff --git a/libjava/java/awt/geom/Point2D$Double.h b/libjava/java/awt/geom/Point2D$Double.h
new file mode 100644
index 000000000..b03db3fa7
--- /dev/null
+++ b/libjava/java/awt/geom/Point2D$Double.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Point2D$Double__
+#define __java_awt_geom_Point2D$Double__
+
+#pragma interface
+
+#include <java/awt/geom/Point2D.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class Point2D$Double;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Point2D$Double : public ::java::awt::geom::Point2D
+{
+
+public:
+  Point2D$Double();
+  Point2D$Double(jdouble, jdouble);
+  virtual jdouble getX();
+  virtual jdouble getY();
+  virtual void setLocation(jdouble, jdouble);
+  virtual ::java::lang::String * toString();
+  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::Point2D)))) x;
+  jdouble y;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Point2D$Double__
diff --git a/libjava/java/awt/geom/Point2D$Float.h b/libjava/java/awt/geom/Point2D$Float.h
new file mode 100644
index 000000000..f9da3d1be
--- /dev/null
+++ b/libjava/java/awt/geom/Point2D$Float.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Point2D$Float__
+#define __java_awt_geom_Point2D$Float__
+
+#pragma interface
+
+#include <java/awt/geom/Point2D.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class Point2D$Float;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Point2D$Float : public ::java::awt::geom::Point2D
+{
+
+public:
+  Point2D$Float();
+  Point2D$Float(jfloat, jfloat);
+  virtual jdouble getX();
+  virtual jdouble getY();
+  virtual void setLocation(jdouble, jdouble);
+  virtual void setLocation(jfloat, jfloat);
+  virtual ::java::lang::String * toString();
+  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::Point2D)))) x;
+  jfloat y;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Point2D$Float__
diff --git a/libjava/java/awt/geom/Point2D.h b/libjava/java/awt/geom/Point2D.h
new file mode 100644
index 000000000..bddd3ab87
--- /dev/null
+++ b/libjava/java/awt/geom/Point2D.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Point2D__
+#define __java_awt_geom_Point2D__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class Point2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Point2D : public ::java::lang::Object
+{
+
+public: // actually protected
+  Point2D();
+public:
+  virtual jdouble getX() = 0;
+  virtual jdouble getY() = 0;
+  virtual void setLocation(jdouble, jdouble) = 0;
+  virtual void setLocation(::java::awt::geom::Point2D *);
+  static jdouble distanceSq(jdouble, jdouble, jdouble, jdouble);
+  static jdouble distance(jdouble, jdouble, jdouble, jdouble);
+  virtual jdouble distanceSq(jdouble, jdouble);
+  virtual jdouble distanceSq(::java::awt::geom::Point2D *);
+  virtual jdouble distance(jdouble, jdouble);
+  virtual jdouble distance(::java::awt::geom::Point2D *);
+  virtual ::java::lang::Object * clone();
+  virtual jint hashCode();
+  virtual jboolean equals(::java::lang::Object *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Point2D__
diff --git a/libjava/java/awt/geom/QuadCurve2D$1.h b/libjava/java/awt/geom/QuadCurve2D$1.h
new file mode 100644
index 000000000..e653cc388
--- /dev/null
+++ b/libjava/java/awt/geom/QuadCurve2D$1.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_QuadCurve2D$1__
+#define __java_awt_geom_QuadCurve2D$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class AffineTransform;
+          class QuadCurve2D;
+          class QuadCurve2D$1;
+      }
+    }
+  }
+}
+
+class java::awt::geom::QuadCurve2D$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  QuadCurve2D$1(::java::awt::geom::QuadCurve2D *, ::java::awt::geom::AffineTransform *);
+public:
+  virtual jint getWindingRule();
+  virtual jboolean isDone();
+  virtual void next();
+  virtual jint currentSegment(JArray< jfloat > *);
+  virtual jint currentSegment(JArray< jdouble > *);
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
+public: // actually package-private
+  ::java::awt::geom::QuadCurve2D * this$0;
+private:
+  ::java::awt::geom::AffineTransform * val$at;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_QuadCurve2D$1__
diff --git a/libjava/java/awt/geom/QuadCurve2D$Double.h b/libjava/java/awt/geom/QuadCurve2D$Double.h
new file mode 100644
index 000000000..91a524b0d
--- /dev/null
+++ b/libjava/java/awt/geom/QuadCurve2D$Double.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_QuadCurve2D$Double__
+#define __java_awt_geom_QuadCurve2D$Double__
+
+#pragma interface
+
+#include <java/awt/geom/QuadCurve2D.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class Point2D;
+          class QuadCurve2D$Double;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::QuadCurve2D$Double : public ::java::awt::geom::QuadCurve2D
+{
+
+public:
+  QuadCurve2D$Double();
+  QuadCurve2D$Double(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  virtual jdouble getX1();
+  virtual jdouble getY1();
+  virtual ::java::awt::geom::Point2D * getP1();
+  virtual jdouble getCtrlX();
+  virtual jdouble getCtrlY();
+  virtual ::java::awt::geom::Point2D * getCtrlPt();
+  virtual jdouble getX2();
+  virtual jdouble getY2();
+  virtual ::java::awt::geom::Point2D * getP2();
+  virtual void setCurve(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
+  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::QuadCurve2D)))) x1;
+  jdouble y1;
+  jdouble ctrlx;
+  jdouble ctrly;
+  jdouble x2;
+  jdouble y2;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_QuadCurve2D$Double__
diff --git a/libjava/java/awt/geom/QuadCurve2D$Float.h b/libjava/java/awt/geom/QuadCurve2D$Float.h
new file mode 100644
index 000000000..b2f36d624
--- /dev/null
+++ b/libjava/java/awt/geom/QuadCurve2D$Float.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_QuadCurve2D$Float__
+#define __java_awt_geom_QuadCurve2D$Float__
+
+#pragma interface
+
+#include <java/awt/geom/QuadCurve2D.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class Point2D;
+          class QuadCurve2D$Float;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::QuadCurve2D$Float : public ::java::awt::geom::QuadCurve2D
+{
+
+public:
+  QuadCurve2D$Float();
+  QuadCurve2D$Float(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
+  virtual jdouble getX1();
+  virtual jdouble getY1();
+  virtual ::java::awt::geom::Point2D * getP1();
+  virtual jdouble getCtrlX();
+  virtual jdouble getCtrlY();
+  virtual ::java::awt::geom::Point2D * getCtrlPt();
+  virtual jdouble getX2();
+  virtual jdouble getY2();
+  virtual ::java::awt::geom::Point2D * getP2();
+  virtual void setCurve(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  virtual void setCurve(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
+  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
+  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::QuadCurve2D)))) x1;
+  jfloat y1;
+  jfloat ctrlx;
+  jfloat ctrly;
+  jfloat x2;
+  jfloat y2;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_QuadCurve2D$Float__
diff --git a/libjava/java/awt/geom/QuadCurve2D.h b/libjava/java/awt/geom/QuadCurve2D.h
new file mode 100644
index 000000000..f9adea41b
--- /dev/null
+++ b/libjava/java/awt/geom/QuadCurve2D.h
@@ -0,0 +1,83 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_QuadCurve2D__
+#define __java_awt_geom_QuadCurve2D__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+      namespace geom
+      {
+          class AffineTransform;
+          class PathIterator;
+          class Point2D;
+          class QuadCurve2D;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::QuadCurve2D : public ::java::lang::Object
+{
+
+public: // actually protected
+  QuadCurve2D();
+public:
+  virtual jdouble getX1() = 0;
+  virtual jdouble getY1() = 0;
+  virtual ::java::awt::geom::Point2D * getP1() = 0;
+  virtual jdouble getCtrlX() = 0;
+  virtual jdouble getCtrlY() = 0;
+  virtual ::java::awt::geom::Point2D * getCtrlPt() = 0;
+  virtual jdouble getX2() = 0;
+  virtual jdouble getY2() = 0;
+  virtual ::java::awt::geom::Point2D * getP2() = 0;
+  virtual void setCurve(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble) = 0;
+  virtual void setCurve(JArray< jdouble > *, jint);
+  virtual void setCurve(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
+  virtual void setCurve(JArray< ::java::awt::geom::Point2D * > *, jint);
+  virtual void setCurve(::java::awt::geom::QuadCurve2D *);
+  static jdouble getFlatnessSq(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  static jdouble getFlatness(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  static jdouble getFlatnessSq(JArray< jdouble > *, jint);
+  static jdouble getFlatness(JArray< jdouble > *, jint);
+  virtual jdouble getFlatnessSq();
+  virtual jdouble getFlatness();
+  virtual void subdivide(::java::awt::geom::QuadCurve2D *, ::java::awt::geom::QuadCurve2D *);
+  static void subdivide(::java::awt::geom::QuadCurve2D *, ::java::awt::geom::QuadCurve2D *, ::java::awt::geom::QuadCurve2D *);
+  static void subdivide(JArray< jdouble > *, jint, JArray< jdouble > *, jint, JArray< jdouble > *, jint);
+  static jint solveQuadratic(JArray< jdouble > *);
+  static jint solveQuadratic(JArray< jdouble > *, JArray< jdouble > *);
+  virtual jboolean contains(jdouble, jdouble);
+  virtual jboolean contains(::java::awt::geom::Point2D *);
+  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
+  virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
+  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
+  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
+  virtual ::java::awt::Rectangle * getBounds();
+  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
+  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
+  virtual ::java::lang::Object * clone();
+private:
+  jint getAxisIntersections(jdouble, jdouble, jboolean, jdouble);
+public:
+  virtual ::java::awt::geom::Rectangle2D * getBounds2D() = 0;
+private:
+  static jdouble BIG_VALUE;
+  static jdouble EPSILON;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_QuadCurve2D__
diff --git a/libjava/java/awt/geom/Rectangle2D$1.h b/libjava/java/awt/geom/Rectangle2D$1.h
new file mode 100644
index 000000000..d1b99d210
--- /dev/null
+++ b/libjava/java/awt/geom/Rectangle2D$1.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Rectangle2D$1__
+#define __java_awt_geom_Rectangle2D$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class AffineTransform;
+          class Rectangle2D;
+          class Rectangle2D$1;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Rectangle2D$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  Rectangle2D$1(::java::awt::geom::Rectangle2D *, jdouble, jdouble, jdouble, jdouble, ::java::awt::geom::AffineTransform *);
+public:
+  virtual jint getWindingRule();
+  virtual jboolean isDone();
+  virtual void next();
+  virtual jint currentSegment(JArray< jfloat > *);
+  virtual jint currentSegment(JArray< jdouble > *);
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) current;
+public: // actually package-private
+  ::java::awt::geom::Rectangle2D * this$0;
+private:
+  jdouble val$maxx;
+  jdouble val$miny;
+  jdouble val$maxy;
+  jdouble val$minx;
+  ::java::awt::geom::AffineTransform * val$at;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Rectangle2D$1__
diff --git a/libjava/java/awt/geom/Rectangle2D$Double.h b/libjava/java/awt/geom/Rectangle2D$Double.h
new file mode 100644
index 000000000..20105f932
--- /dev/null
+++ b/libjava/java/awt/geom/Rectangle2D$Double.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Rectangle2D$Double__
+#define __java_awt_geom_Rectangle2D$Double__
+
+#pragma interface
+
+#include <java/awt/geom/Rectangle2D.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class Rectangle2D;
+          class Rectangle2D$Double;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Rectangle2D$Double : public ::java::awt::geom::Rectangle2D
+{
+
+public:
+  Rectangle2D$Double();
+  Rectangle2D$Double(jdouble, jdouble, jdouble, jdouble);
+  virtual jdouble getX();
+  virtual jdouble getY();
+  virtual jdouble getWidth();
+  virtual jdouble getHeight();
+  virtual jboolean isEmpty();
+  virtual void setRect(jdouble, jdouble, jdouble, jdouble);
+  virtual void setRect(::java::awt::geom::Rectangle2D *);
+  virtual jint outcode(jdouble, jdouble);
+  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
+  virtual ::java::awt::geom::Rectangle2D * createIntersection(::java::awt::geom::Rectangle2D *);
+  virtual ::java::awt::geom::Rectangle2D * createUnion(::java::awt::geom::Rectangle2D *);
+  virtual ::java::lang::String * toString();
+  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::Rectangle2D)))) x;
+  jdouble y;
+  jdouble width;
+  jdouble height;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Rectangle2D$Double__
diff --git a/libjava/java/awt/geom/Rectangle2D$Float.h b/libjava/java/awt/geom/Rectangle2D$Float.h
new file mode 100644
index 000000000..61dbf373c
--- /dev/null
+++ b/libjava/java/awt/geom/Rectangle2D$Float.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Rectangle2D$Float__
+#define __java_awt_geom_Rectangle2D$Float__
+
+#pragma interface
+
+#include <java/awt/geom/Rectangle2D.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class Rectangle2D;
+          class Rectangle2D$Float;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Rectangle2D$Float : public ::java::awt::geom::Rectangle2D
+{
+
+public:
+  Rectangle2D$Float();
+  Rectangle2D$Float(jfloat, jfloat, jfloat, jfloat);
+public: // actually package-private
+  Rectangle2D$Float(jdouble, jdouble, jdouble, jdouble);
+public:
+  virtual jdouble getX();
+  virtual jdouble getY();
+  virtual jdouble getWidth();
+  virtual jdouble getHeight();
+  virtual jboolean isEmpty();
+  virtual void setRect(jfloat, jfloat, jfloat, jfloat);
+  virtual void setRect(jdouble, jdouble, jdouble, jdouble);
+  virtual void setRect(::java::awt::geom::Rectangle2D *);
+  virtual jint outcode(jdouble, jdouble);
+  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
+  virtual ::java::awt::geom::Rectangle2D * createIntersection(::java::awt::geom::Rectangle2D *);
+  virtual ::java::awt::geom::Rectangle2D * createUnion(::java::awt::geom::Rectangle2D *);
+  virtual ::java::lang::String * toString();
+  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::Rectangle2D)))) x;
+  jfloat y;
+  jfloat width;
+  jfloat height;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Rectangle2D$Float__
diff --git a/libjava/java/awt/geom/Rectangle2D.h b/libjava/java/awt/geom/Rectangle2D.h
new file mode 100644
index 000000000..e81e0a8e1
--- /dev/null
+++ b/libjava/java/awt/geom/Rectangle2D.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_Rectangle2D__
+#define __java_awt_geom_Rectangle2D__
+
+#pragma interface
+
+#include <java/awt/geom/RectangularShape.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class AffineTransform;
+          class Line2D;
+          class PathIterator;
+          class Point2D;
+          class Rectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::Rectangle2D : public ::java::awt::geom::RectangularShape
+{
+
+public: // actually protected
+  Rectangle2D();
+public:
+  virtual void setRect(jdouble, jdouble, jdouble, jdouble) = 0;
+  virtual void setRect(::java::awt::geom::Rectangle2D *);
+  virtual jboolean intersectsLine(jdouble, jdouble, jdouble, jdouble);
+  virtual jboolean intersectsLine(::java::awt::geom::Line2D *);
+  virtual jint outcode(jdouble, jdouble) = 0;
+  virtual jint outcode(::java::awt::geom::Point2D *);
+  virtual void setFrame(jdouble, jdouble, jdouble, jdouble);
+  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
+  virtual jboolean contains(jdouble, jdouble);
+  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
+  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
+  virtual ::java::awt::geom::Rectangle2D * createIntersection(::java::awt::geom::Rectangle2D *) = 0;
+  static void intersect(::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *);
+  virtual ::java::awt::geom::Rectangle2D * createUnion(::java::awt::geom::Rectangle2D *) = 0;
+  static void union$(::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *);
+  virtual void add(jdouble, jdouble);
+  virtual void add(::java::awt::geom::Point2D *);
+  virtual void add(::java::awt::geom::Rectangle2D *);
+  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
+  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
+  virtual jint hashCode();
+  virtual jboolean equals(::java::lang::Object *);
+  static const jint OUT_LEFT = 1;
+  static const jint OUT_TOP = 2;
+  static const jint OUT_RIGHT = 4;
+  static const jint OUT_BOTTOM = 8;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_Rectangle2D__
diff --git a/libjava/java/awt/geom/RectangularShape.h b/libjava/java/awt/geom/RectangularShape.h
new file mode 100644
index 000000000..18e1360fa
--- /dev/null
+++ b/libjava/java/awt/geom/RectangularShape.h
@@ -0,0 +1,69 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_RectangularShape__
+#define __java_awt_geom_RectangularShape__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Rectangle;
+      namespace geom
+      {
+          class AffineTransform;
+          class Dimension2D;
+          class PathIterator;
+          class Point2D;
+          class Rectangle2D;
+          class RectangularShape;
+      }
+    }
+  }
+}
+
+class java::awt::geom::RectangularShape : public ::java::lang::Object
+{
+
+public: // actually protected
+  RectangularShape();
+public:
+  virtual jdouble getX() = 0;
+  virtual jdouble getY() = 0;
+  virtual jdouble getWidth() = 0;
+  virtual jdouble getHeight() = 0;
+  virtual jdouble getMinX();
+  virtual jdouble getMinY();
+  virtual jdouble getMaxX();
+  virtual jdouble getMaxY();
+  virtual jdouble getCenterX();
+  virtual jdouble getCenterY();
+  virtual ::java::awt::geom::Rectangle2D * getFrame();
+  virtual jboolean isEmpty() = 0;
+  virtual void setFrame(jdouble, jdouble, jdouble, jdouble) = 0;
+  virtual void setFrame(::java::awt::geom::Point2D *, ::java::awt::geom::Dimension2D *);
+  virtual void setFrame(::java::awt::geom::Rectangle2D *);
+  virtual void setFrameFromDiagonal(jdouble, jdouble, jdouble, jdouble);
+  virtual void setFrameFromDiagonal(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
+  virtual void setFrameFromCenter(jdouble, jdouble, jdouble, jdouble);
+  virtual void setFrameFromCenter(::java::awt::geom::Point2D *, ::java::awt::geom::Point2D *);
+  virtual jboolean contains(::java::awt::geom::Point2D *);
+  virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
+  virtual jboolean contains(::java::awt::geom::Rectangle2D *);
+  virtual ::java::awt::Rectangle * getBounds();
+  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
+  virtual ::java::lang::Object * clone();
+  virtual ::java::awt::geom::Rectangle2D * getBounds2D() = 0;
+  virtual jboolean contains(jdouble, jdouble) = 0;
+  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble) = 0;
+  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble) = 0;
+  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *) = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_RectangularShape__
diff --git a/libjava/java/awt/geom/RoundRectangle2D$1.h b/libjava/java/awt/geom/RoundRectangle2D$1.h
new file mode 100644
index 000000000..76a82e871
--- /dev/null
+++ b/libjava/java/awt/geom/RoundRectangle2D$1.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_RoundRectangle2D$1__
+#define __java_awt_geom_RoundRectangle2D$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class AffineTransform;
+          class Arc2D$Double;
+          class PathIterator;
+          class RoundRectangle2D;
+          class RoundRectangle2D$1;
+      }
+    }
+  }
+}
+
+class java::awt::geom::RoundRectangle2D$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  RoundRectangle2D$1(::java::awt::geom::RoundRectangle2D *, ::java::awt::geom::AffineTransform *);
+public:
+  virtual jint currentSegment(JArray< jdouble > *);
+  virtual jint currentSegment(JArray< jfloat > *);
+  virtual jint getWindingRule();
+  virtual jboolean isDone();
+  virtual void next();
+public: // actually package-private
+  jdouble __attribute__((aligned(__alignof__( ::java::lang::Object)))) x;
+  jdouble y;
+  jdouble w;
+  jdouble h;
+  jdouble arcW;
+  jdouble arcH;
+  ::java::awt::geom::Arc2D$Double * arc;
+  ::java::awt::geom::PathIterator * corner;
+  jint step;
+  ::java::awt::geom::RoundRectangle2D * this$0;
+private:
+  ::java::awt::geom::AffineTransform * val$at;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_RoundRectangle2D$1__
diff --git a/libjava/java/awt/geom/RoundRectangle2D$Double.h b/libjava/java/awt/geom/RoundRectangle2D$Double.h
new file mode 100644
index 000000000..08010fd41
--- /dev/null
+++ b/libjava/java/awt/geom/RoundRectangle2D$Double.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_RoundRectangle2D$Double__
+#define __java_awt_geom_RoundRectangle2D$Double__
+
+#pragma interface
+
+#include <java/awt/geom/RoundRectangle2D.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class Rectangle2D;
+          class RoundRectangle2D$Double;
+      }
+    }
+  }
+}
+
+class java::awt::geom::RoundRectangle2D$Double : public ::java::awt::geom::RoundRectangle2D
+{
+
+public:
+  RoundRectangle2D$Double();
+  RoundRectangle2D$Double(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  virtual jdouble getArcHeight();
+  virtual jdouble getArcWidth();
+  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
+  virtual jdouble getX();
+  virtual jdouble getY();
+  virtual jdouble getWidth();
+  virtual jdouble getHeight();
+  virtual jboolean isEmpty();
+  virtual void setRoundRect(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  jdouble __attribute__((aligned(__alignof__( ::java::awt::geom::RoundRectangle2D)))) archeight;
+  jdouble arcwidth;
+  jdouble x;
+  jdouble y;
+  jdouble width;
+  jdouble height;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_RoundRectangle2D$Double__
diff --git a/libjava/java/awt/geom/RoundRectangle2D$Float.h b/libjava/java/awt/geom/RoundRectangle2D$Float.h
new file mode 100644
index 000000000..184c5f4b1
--- /dev/null
+++ b/libjava/java/awt/geom/RoundRectangle2D$Float.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_RoundRectangle2D$Float__
+#define __java_awt_geom_RoundRectangle2D$Float__
+
+#pragma interface
+
+#include <java/awt/geom/RoundRectangle2D.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class Rectangle2D;
+          class RoundRectangle2D$Float;
+      }
+    }
+  }
+}
+
+class java::awt::geom::RoundRectangle2D$Float : public ::java::awt::geom::RoundRectangle2D
+{
+
+public:
+  RoundRectangle2D$Float();
+  RoundRectangle2D$Float(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
+  virtual jdouble getArcHeight();
+  virtual jdouble getArcWidth();
+  virtual ::java::awt::geom::Rectangle2D * getBounds2D();
+  virtual jdouble getX();
+  virtual jdouble getY();
+  virtual jdouble getWidth();
+  virtual jdouble getHeight();
+  virtual jboolean isEmpty();
+  virtual void setRoundRect(jfloat, jfloat, jfloat, jfloat, jfloat, jfloat);
+  virtual void setRoundRect(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+  jfloat __attribute__((aligned(__alignof__( ::java::awt::geom::RoundRectangle2D)))) archeight;
+  jfloat arcwidth;
+  jfloat x;
+  jfloat y;
+  jfloat width;
+  jfloat height;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_RoundRectangle2D$Float__
diff --git a/libjava/java/awt/geom/RoundRectangle2D.h b/libjava/java/awt/geom/RoundRectangle2D.h
new file mode 100644
index 000000000..a9092ca5c
--- /dev/null
+++ b/libjava/java/awt/geom/RoundRectangle2D.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_geom_RoundRectangle2D__
+#define __java_awt_geom_RoundRectangle2D__
+
+#pragma interface
+
+#include <java/awt/geom/RectangularShape.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace geom
+      {
+          class AffineTransform;
+          class PathIterator;
+          class RoundRectangle2D;
+      }
+    }
+  }
+}
+
+class java::awt::geom::RoundRectangle2D : public ::java::awt::geom::RectangularShape
+{
+
+public:
+  virtual jdouble getArcHeight() = 0;
+  virtual jdouble getArcWidth() = 0;
+  virtual void setRoundRect(jdouble, jdouble, jdouble, jdouble, jdouble, jdouble) = 0;
+public: // actually protected
+  RoundRectangle2D();
+public:
+  virtual jboolean contains(jdouble, jdouble);
+  virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
+  virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
+  virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
+  virtual void setFrame(jdouble, jdouble, jdouble, jdouble);
+  virtual void setRoundRect(::java::awt::geom::RoundRectangle2D *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_geom_RoundRectangle2D__