Skip to content

R
riscv-gcc-1
Commit 21a0c6e0 by Kriang Lerdsuwanakij Committed by Kriang Lerdsuwanakij
Options

Makefile.am: Correct friend function declaration. 

	* Makefile.am: Correct friend function declaration.
	* Makefile.in: Regenerated.
	* include/boehm-gc.h (JV_MARKOBJ_DECL, JV_MARKARRAY_DECL): Add
	scope to function names.  Declare functions directly.
	* libjava/java/lang/Class.h
	(java::lang::Class): Correct friend class declaration.
	(_Jv_InitClass, _Jv_GetArrayClass): Move definition to global
	scope.
	* libjava/java/lang/Class.h
	(java::lang::Object): Correct friend class declaration.

From-SVN: r90849
parent 7915fbaa
Showing with 115 additions and 53 deletions
libjava/ChangeLog
2004-11-18 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
* Makefile.am: Correct friend function declaration.
* Makefile.in: Regenerated.
* include/boehm-gc.h (JV_MARKOBJ_DECL, JV_MARKARRAY_DECL): Add
scope to function names. Declare functions directly.
* libjava/java/lang/Class.h
(java::lang::Class): Correct friend class declaration.
(_Jv_InitClass, _Jv_GetArrayClass): Move definition to global
scope.
* libjava/java/lang/Class.h
(java::lang::Object): Correct friend class declaration.
2004-11-17 David Daney <ddaney@avtrex.com>
* java/io/BufferedInputStream.java (skip): Return zero on EOF.
......
libjava/Makefile.am
......@@ -640,8 +640,10 @@ $(ordinary_nat_headers) $(xlib_nat_headers): %.h: %.class
java/lang/ClassLoader.h: java/lang/ClassLoader.class
$(GCJH) -classpath '' -bootclasspath $(top_builddir) \
-friend 'jclass _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \
-friend 'void _Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, bool is_jar);' \
-prepend 'jclass _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \
-prepend 'void _Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, bool is_jar);' \
-friend 'jclass (::_Jv_FindClass) (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \
-friend 'void ::_Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, bool is_jar);' \
$(basename $<)
java/lang/Thread.h: java/lang/Thread.class
......@@ -649,45 +651,64 @@ java/lang/Thread.h: java/lang/Thread.class
-prepend 'class _Jv_JNIEnv;' \
-prepend '#define _JV_NOT_OWNER 1' \
-prepend '#define _JV_INTERRUPTED 2' \
-friend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \
-friend 'void _Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \
-friend 'void _Jv_ThreadRun (java::lang::Thread* thread);' \
-friend 'jint _Jv_AttachCurrentThread(java::lang::Thread* thread);' \
-friend 'java::lang::Thread* _Jv_AttachCurrentThread(jstring name, java::lang::ThreadGroup* group);' \
-friend 'java::lang::Thread* _Jv_AttachCurrentThreadAsDaemon(jstring name, java::lang::ThreadGroup* group);' \
-friend 'jint _Jv_DetachCurrentThread ();' \
-prepend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \
-prepend 'void _Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \
-prepend 'void _Jv_ThreadRun (java::lang::Thread* thread);' \
-prepend 'jint _Jv_AttachCurrentThread(java::lang::Thread* thread);' \
-prepend 'java::lang::Thread* _Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);' \
-prepend 'java::lang::Thread* _Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);' \
-prepend 'jint _Jv_DetachCurrentThread ();' \
-friend '_Jv_JNIEnv * ::_Jv_GetCurrentJNIEnv ();' \
-friend 'void ::_Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \
-friend 'void ::_Jv_ThreadRun (java::lang::Thread* thread);' \
-friend 'jint (::_Jv_AttachCurrentThread) (java::lang::Thread* thread);' \
-friend 'java::lang::Thread* ::_Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);' \
-friend 'java::lang::Thread* ::_Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);' \
-friend 'jint (::_Jv_DetachCurrentThread) ();' \
$(basename $<)
java/lang/String.h: java/lang/String.class
$(GCJH) -classpath '' -bootclasspath $(top_builddir) \
-friend 'jchar* _Jv_GetStringChars (jstring str);' \
-friend 'jstring* _Jv_StringFindSlot (jchar*, jint, jint);' \
-friend 'jstring* _Jv_StringGetSlot (jstring);' \
-friend 'jstring _Jv_NewStringUtf8Const (_Jv_Utf8Const* str);' \
-friend 'jstring _Jv_NewStringLatin1 (const char*, jsize);' \
-friend 'jstring _Jv_AllocString (jsize);' \
-prepend 'jchar* _Jv_GetStringChars (jstring str);' \
-prepend 'jstring* _Jv_StringFindSlot (jchar*, jint, jint);' \
-prepend 'jstring* _Jv_StringGetSlot (jstring);' \
-prepend 'jstring _Jv_NewStringUtf8Const (_Jv_Utf8Const* str);' \
-prepend 'jstring _Jv_NewStringLatin1 (const char*, jsize);' \
-prepend 'jstring _Jv_AllocString (jsize);' \
-friend 'jchar* ::_Jv_GetStringChars (jstring str);' \
-friend 'jstring* ::_Jv_StringFindSlot (jchar*, jint, jint);' \
-friend 'jstring* ::_Jv_StringGetSlot (jstring);' \
-friend 'jstring (::_Jv_NewStringUtf8Const) (_Jv_Utf8Const* str);' \
-friend 'jstring (::_Jv_NewStringLatin1) (const char*, jsize);' \
-friend 'jstring (::_Jv_AllocString) (jsize);' \
$(basename $<)
java/lang/reflect/Constructor.h: java/lang/reflect/Constructor.class
$(GCJH) -classpath '' -bootclasspath $(top_builddir) \
-friend 'jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);' \
-prepend 'jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);' \
-prepend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
-friend 'jmethodID (::_Jv_FromReflectedConstructor) (java::lang::reflect::Constructor *);' \
-friend 'jobject (::_Jv_JNI_ToReflectedMethod) (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
-friend 'class java::lang::Class;' \
-friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
$(basename $<)
java/lang/reflect/Field.h: java/lang/reflect/Field.class
$(GCJH) -classpath '' -bootclasspath $(top_builddir) \
-friend 'jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);' \
-friend 'jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \
-prepend 'jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);' \
-prepend 'jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \
-friend 'jfieldID (::_Jv_FromReflectedField) (java::lang::reflect::Field *);' \
-friend 'jobject (::_Jv_JNI_ToReflectedField) (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \
-friend 'class java::lang::Class;' \
$(basename $<)
java/lang/reflect/Method.h: java/lang/reflect/Method.class
$(GCJH) -classpath '' -bootclasspath $(top_builddir) \
-friend 'jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);' \
-prepend 'jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);' \
-prepend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
-friend 'jmethodID (::_Jv_FromReflectedMethod) (java::lang::reflect::Method *);' \
-friend 'jobject (::_Jv_JNI_ToReflectedMethod) (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
-friend 'class java::lang::Class;' \
-friend 'class java::io::ObjectInputStream;' \
-friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
$(basename $<)
java/lang/reflect/Proxy.h: java/lang/reflect/Proxy.class
......
libjava/Makefile.in
......@@ -23803,8 +23803,10 @@ $(ordinary_nat_headers) $(xlib_nat_headers): %.h: %.class
java/lang/ClassLoader.h: java/lang/ClassLoader.class
$(GCJH) -classpath '' -bootclasspath $(top_builddir) \
-friend 'jclass _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \
-friend 'void _Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, bool is_jar);' \
-prepend 'jclass _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \
-prepend 'void _Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, bool is_jar);' \
-friend 'jclass (::_Jv_FindClass) (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \
-friend 'void ::_Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, bool is_jar);' \
$(basename $<)
java/lang/Thread.h: java/lang/Thread.class
......@@ -23812,45 +23814,64 @@ java/lang/Thread.h: java/lang/Thread.class
-prepend 'class _Jv_JNIEnv;' \
-prepend '#define _JV_NOT_OWNER 1' \
-prepend '#define _JV_INTERRUPTED 2' \
-friend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \
-friend 'void _Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \
-friend 'void _Jv_ThreadRun (java::lang::Thread* thread);' \
-friend 'jint _Jv_AttachCurrentThread(java::lang::Thread* thread);' \
-friend 'java::lang::Thread* _Jv_AttachCurrentThread(jstring name, java::lang::ThreadGroup* group);' \
-friend 'java::lang::Thread* _Jv_AttachCurrentThreadAsDaemon(jstring name, java::lang::ThreadGroup* group);' \
-friend 'jint _Jv_DetachCurrentThread ();' \
-prepend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \
-prepend 'void _Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \
-prepend 'void _Jv_ThreadRun (java::lang::Thread* thread);' \
-prepend 'jint _Jv_AttachCurrentThread(java::lang::Thread* thread);' \
-prepend 'java::lang::Thread* _Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);' \
-prepend 'java::lang::Thread* _Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);' \
-prepend 'jint _Jv_DetachCurrentThread ();' \
-friend '_Jv_JNIEnv * ::_Jv_GetCurrentJNIEnv ();' \
-friend 'void ::_Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \
-friend 'void ::_Jv_ThreadRun (java::lang::Thread* thread);' \
-friend 'jint (::_Jv_AttachCurrentThread) (java::lang::Thread* thread);' \
-friend 'java::lang::Thread* ::_Jv_AttachCurrentThread (jstring name, java::lang::ThreadGroup* group);' \
-friend 'java::lang::Thread* ::_Jv_AttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group);' \
-friend 'jint (::_Jv_DetachCurrentThread) ();' \
$(basename $<)
java/lang/String.h: java/lang/String.class
$(GCJH) -classpath '' -bootclasspath $(top_builddir) \
-friend 'jchar* _Jv_GetStringChars (jstring str);' \
-friend 'jstring* _Jv_StringFindSlot (jchar*, jint, jint);' \
-friend 'jstring* _Jv_StringGetSlot (jstring);' \
-friend 'jstring _Jv_NewStringUtf8Const (_Jv_Utf8Const* str);' \
-friend 'jstring _Jv_NewStringLatin1 (const char*, jsize);' \
-friend 'jstring _Jv_AllocString (jsize);' \
-prepend 'jchar* _Jv_GetStringChars (jstring str);' \
-prepend 'jstring* _Jv_StringFindSlot (jchar*, jint, jint);' \
-prepend 'jstring* _Jv_StringGetSlot (jstring);' \
-prepend 'jstring _Jv_NewStringUtf8Const (_Jv_Utf8Const* str);' \
-prepend 'jstring _Jv_NewStringLatin1 (const char*, jsize);' \
-prepend 'jstring _Jv_AllocString (jsize);' \
-friend 'jchar* ::_Jv_GetStringChars (jstring str);' \
-friend 'jstring* ::_Jv_StringFindSlot (jchar*, jint, jint);' \
-friend 'jstring* ::_Jv_StringGetSlot (jstring);' \
-friend 'jstring (::_Jv_NewStringUtf8Const) (_Jv_Utf8Const* str);' \
-friend 'jstring (::_Jv_NewStringLatin1) (const char*, jsize);' \
-friend 'jstring (::_Jv_AllocString) (jsize);' \
$(basename $<)
java/lang/reflect/Constructor.h: java/lang/reflect/Constructor.class
$(GCJH) -classpath '' -bootclasspath $(top_builddir) \
-friend 'jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);' \
-prepend 'jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);' \
-prepend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
-friend 'jmethodID (::_Jv_FromReflectedConstructor) (java::lang::reflect::Constructor *);' \
-friend 'jobject (::_Jv_JNI_ToReflectedMethod) (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
-friend 'class java::lang::Class;' \
-friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
$(basename $<)
java/lang/reflect/Field.h: java/lang/reflect/Field.class
$(GCJH) -classpath '' -bootclasspath $(top_builddir) \
-friend 'jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);' \
-friend 'jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \
-prepend 'jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);' \
-prepend 'jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \
-friend 'jfieldID (::_Jv_FromReflectedField) (java::lang::reflect::Field *);' \
-friend 'jobject (::_Jv_JNI_ToReflectedField) (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \
-friend 'class java::lang::Class;' \
$(basename $<)
java/lang/reflect/Method.h: java/lang/reflect/Method.class
$(GCJH) -classpath '' -bootclasspath $(top_builddir) \
-friend 'jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);' \
-prepend 'jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);' \
-prepend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
-friend 'jmethodID (::_Jv_FromReflectedMethod) (java::lang::reflect::Method *);' \
-friend 'jobject (::_Jv_JNI_ToReflectedMethod) (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
-friend 'class java::lang::Class;' \
-friend 'class java::io::ObjectInputStream;' \
-friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
$(basename $<)
java/lang/reflect/Proxy.h: java/lang/reflect/Proxy.class
libjava/include/boehm-gc.h
// -*- c++ -*-
// boehm-gc.h - Defines for Boehm collector.
/* Copyright (C) 1998, 1999, 2002 Free Software Foundation
/* Copyright (C) 1998, 1999, 2002, 2004 Free Software Foundation
This file is part of libgcj.
......@@ -12,13 +12,13 @@ details. */
#ifndef __JV_BOEHM_GC__
#define __JV_BOEHM_GC__
#define JV_MARKOBJ_DECL void *_Jv_MarkObj (void *, void *, void *, void *)
#define JV_MARKARRAY_DECL void *_Jv_MarkArray (void *, void *, void *, void *)
#define JV_MARKOBJ_DECL void *::_Jv_MarkObj (void *, void *, void *, void *)
#define JV_MARKARRAY_DECL void *::_Jv_MarkArray (void *, void *, void *, void *)
extern "C"
{
JV_MARKOBJ_DECL;
JV_MARKARRAY_DECL;
void *_Jv_MarkObj (void *, void *, void *, void *);
void *_Jv_MarkArray (void *, void *, void *, void *);
}
// Enough stuff to inline _Jv_AllocObj. Ugly.
......
libjava/java/lang/Object.h
// Object.h - Header file for java.lang.Object. -*- c++ -*-
/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation
/* Copyright (C) 1998, 1999, 2000, 2001, 2004 Free Software Foundation
This file is part of libgcj.
......@@ -28,6 +28,13 @@ protected:
# endif
};
// Forward declarations for friends of java::lang::Object
void _Jv_MonitorEnter (jobject obj);
void _Jv_MonitorExit (jobject obj);
void _Jv_InitializeSyncMutex (void);
void _Jv_FinalizeObject (jobject obj);
bool _Jv_ObjectCheckMonitor (jobject obj);
class java::lang::Object : public _JvObjectPrefix
{
protected:
......@@ -45,11 +52,11 @@ public:
void wait (void);
void wait (jlong timeout);
friend void _Jv_MonitorEnter (jobject obj);
friend void _Jv_MonitorExit (jobject obj);
friend void _Jv_InitializeSyncMutex (void);
friend void _Jv_FinalizeObject (jobject obj);
friend bool _Jv_ObjectCheckMonitor (jobject obj);
friend void ::_Jv_MonitorEnter (jobject obj);
friend void ::_Jv_MonitorExit (jobject obj);
friend void ::_Jv_InitializeSyncMutex (void);
friend void ::_Jv_FinalizeObject (jobject obj);
friend bool ::_Jv_ObjectCheckMonitor (jobject obj);
#ifdef JV_MARKOBJ_DECL
friend JV_MARKOBJ_DECL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment