public inbox for java-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* [patch] classpath-0.96.1 merge
@ 2007-10-21 21:47 Matthias Klose
  2007-10-22  0:05 ` Andrew John Hughes
  2007-10-26 19:55 ` Mario Torre
  0 siblings, 2 replies; 3+ messages in thread
From: Matthias Klose @ 2007-10-21 21:47 UTC (permalink / raw)
  To: GCJ-patches, classpath

[-- Attachment #1: Type: text/plain, Size: 3306 bytes --]

Prepared the classpath-0.96.1 merge in the gcj/classpath-0961-import-branch, the
branch is based on r129533, tested on i686-linux-gnu. The libjava testsuite
doesn't show any regressions, the mauve testsuite looks better, but has a few
regressions as well. On irc I did get comments between "just merge selected
changes" and "it's java anyway", so I don't (yet) propose this for the current
trunk.

  Matthias

mauve differences trunk/import-branch:

-FAIL: gnu.javax.crypto.key.srp6.TestOfSRPKeyGeneration
+FAIL: gnu.javax.crypto.keyring.TestOfGnuPrivateKeyring
+FAIL: java.awt.Canvas.PaintTest
+FAIL: java.awt.Checkbox.PaintTest
+FAIL: java.awt.Choice.PaintTest
-FAIL: java.awt.Component.keyPressTest
+FAIL: java.awt.Component.invalidate
-FAIL: java.awt.Component.update
+FAIL: java.awt.Component.keyPressTest
-FAIL: java.awt.Graphics.TestPaintGraphics
+FAIL: java.awt.List.ScrollbarPaintTest
-FAIL: java.awt.Robot.getPixelColor
-FAIL: java.awt.Robot.mousePress
-FAIL: java.awt.Robot.mouseRelease
-FAIL: java.awt.Robot.mouseWheel
-FAIL: java.awt.Scrollbar.ScrollbarPaintTest
-FAIL: java.awt.TextComponent.ignoreOldMouseEvents
+FAIL: java.awt.TextField.PaintTest
-FAIL: java.awt.dnd.DragGestureRecognizer.resetRecognizer
-FAIL: java.awt.event.MouseEvent.modifiers
-FAIL: java.lang.ref.PhantomReference.phantom
-FAIL: java.util.prefs.PreferenceTest
-FAIL: javax.swing.JComboBox.ComboRobot
-FAIL: javax.swing.JComponent.paint
-FAIL: javax.swing.JFrame.SetSize
-FAIL: javax.swing.JFrame.paint5
-FAIL: javax.swing.JInternalFrame.AccessibleJInternalFrame.getAccessibleName
-FAIL: javax.swing.JTree.getCellRenderer
-FAIL: javax.swing.JTree.isRowSelected
-FAIL: javax.swing.JTree.setModel
-FAIL: javax.swing.ScrollPaneLayout.minimumLayoutSize
+FAIL: javax.swing.Timer.test_23918
+FAIL: javax.swing.text.DefaultStyledDocument.ElementBuffer.insert

Could somebody re-run the mauve testsuite with the trunk and the import branch?
 TEST RESULTS:
-250 of 3135 tests failed.  123103 total calls to harness.check() failed.
+238 of 3135 tests failed.  123197 total calls to harness.check() failed.

The merge itself didn't show conflicts except for two gcj local places in
tools/Makefile.am and lib/Makefile.am.

libjava/

2007-10-21  Matthias Klose  <doko@ubuntu.com>

        Import GNU Classpath (classpath-0_96_1-release).

        * Regenerate class and header files.
        * Regenerate auto* files.

        * gnu/classpath/jdwp/VMVirtualMachine.java,
        java/security/VMSecureRandom.java: Merge from classpath.

        * HACKING: Fix typo.

libjava/classpath/

2007-10-21  Matthias Klose  <doko@ubuntu.com>

        * native/jni/gstreamer-peer/Makefile.am: Do not link with
        libclasspathnative.
        * native/jni/gstreamer-peer/Makefile.in: Regenerate.


the merge introduces:

2007-08-30  Christian Thalinger  <twisti@complang.tuwien.ac.at>

        * include/jni.h (jobjectRefType): New type.
        (JNI_VERSION_1_6): Added.
        (JNINativeInterface_): Added GetObjectRefType.
        (_Jv_JNIEnv): Likewise.

which either needs to be reverted for the import, or libjava needs an updated; a
stub implementation is appended (and found on the branch).

the complete patch can be seen with
svn diff -r129534:129542
svn://gcc.gnu.org/svn/gcc/branches/gcj/classpath-0961-import-branch/libjava


[-- Attachment #2: objectreftype.diff --]
[-- Type: text/plain, Size: 1725 bytes --]

2007-10-21  Matthias Klose  <doko@ubuntu.com>

	* gcj/javaprims.h: Define jobjectRefType.
	* jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
	(_Jv_JNIFunctions): Initialize GetObjectRefType.

Index: gcj/javaprims.h
===================================================================
--- gcj/javaprims.h	(revision 129534)
+++ gcj/javaprims.h	(working copy)
@@ -855,6 +855,15 @@
 typedef struct _Jv_Field *jfieldID;
 typedef struct _Jv_Method *jmethodID;
 
+enum _Jv_jobjectRefType
+{
+  JNIInvalidRefType    = 0,
+  JNILocalRefType      = 1,
+  JNIGlobalRefType     = 2,
+  JNIWeakGlobalRefType = 3
+};
+typedef enum _Jv_jobjectRefType jobjectRefType;
+
 extern "C" jobject _Jv_AllocObject (jclass) __attribute__((__malloc__));
 extern "C" jobject _Jv_AllocObjectNoFinalizer (jclass) __attribute__((__malloc__));
 extern "C" jobject _Jv_AllocObjectNoInitNoFinalizer (jclass) __attribute__((__malloc__));
Index: jni.cc
===================================================================
--- jni.cc	(revision 129534)
+++ jni.cc	(working copy)
@@ -1802,6 +1802,13 @@
   return tmp->capacity();
 }
 
+static jobjectRefType JNICALL
+_Jv_JNI_GetObjectRefType (JNIEnv *, jobject object)
+{
+  JvFail("GetObjectRefType not implemented");
+  return JNIInvalidRefType;
+}
+
 \f
 
 struct NativeMethodCacheEntry : public JNINativeMethod
@@ -2873,7 +2880,9 @@
 
   _Jv_JNI_NewDirectByteBuffer,		    // NewDirectByteBuffer
   _Jv_JNI_GetDirectBufferAddress,	    // GetDirectBufferAddress
-  _Jv_JNI_GetDirectBufferCapacity	    // GetDirectBufferCapacity
+  _Jv_JNI_GetDirectBufferCapacity,	    // GetDirectBufferCapacity
+
+  _Jv_JNI_GetObjectRefType		    // GetObjectRefType
 };
 
 struct JNIInvokeInterface_ _Jv_JNI_InvokeFunctions =

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-10-26 19:55 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-10-21 21:47 [patch] classpath-0.96.1 merge Matthias Klose
2007-10-22  0:05 ` Andrew John Hughes
2007-10-26 19:55 ` Mario Torre

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).