Skip to content

R
riscv-gcc-1
Commit 73840519 by Nic Ferrier
Options

Makefile.am (libgcj.jar:): Change to -CLASSPATH 

	* Makefile.am (libgcj.jar:): Change to -CLASSPATH
	(.class.h:): Ditto.
	(java/lang/ClassLoader.h:): Ditto.
	(java/lang/Thread.h:): Ditto.
	(java/lang/String.h:): Ditto.
	(java/lang/reflect/Constructor.h:): Ditto.
	(java/lang/reflect/Field.h:): Ditto.
	(java/lang/reflect/Method.h:): Ditto.
	(gnu/gcj/runtime/VMClassLoader.h:): Ditto.
	(java/io/ObjectInputStream$$GetField.h:): Ditto.
	(java/io/ObjectOutputStream$$PutField.h:): Ditto.
	* Makefile.in: Rebuilt with libgcj Automake.

From-SVN: r49927
parent bf1d0164
Showing with 28 additions and 67 deletions
libjava/Makefile.am
...@@ -186,8 +186,8 @@ libgcj.jar: $(built_java_source_files) $(java_source_files) $(x_java_source_file ...@@ -186,8 +186,8 @@ libgcj.jar: $(built_java_source_files) $(java_source_files) $(x_java_source_file
@set fnord $(MAKEFLAGS); amf=$$2; fail=no; \ @set fnord $(MAKEFLAGS); amf=$$2; fail=no; \
javac="$(JAVAC)"; \ javac="$(JAVAC)"; \
cat tmp-list | (while read f; do \ cat tmp-list | (while read f; do \
echo $$javac $(JCFLAGS) -classpath $(here):$(srcdir) -d $(here) $$f; \ echo $$javac $(JCFLAGS) -CLASSPATH $(here):$(srcdir) -d $(here) $$f; \
$$javac $(JCFLAGS) -classpath $(here):$(srcdir) -d $(here) $$f \ $$javac $(JCFLAGS) -CLASSPATH $(here):$(srcdir) -d $(here) $$f \
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes ;; *) exit 1;; esac; \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes ;; *) exit 1;; esac; \
done; \ done; \
test "$$fail" = no) test "$$fail" = no)
...@@ -256,7 +256,7 @@ libgcjx.la: $(libgcjx_la_OBJECTS) $(libgcjx_la_DEPENDENCIES) ...@@ -256,7 +256,7 @@ libgcjx.la: $(libgcjx_la_OBJECTS) $(libgcjx_la_DEPENDENCIES)
.class.h: .class.h:
## FIXME: GNU make specific. ## FIXME: GNU make specific.
$(GCJH) -classpath $(top_builddir) $(basename $<) $(GCJH) -CLASSPATH $(top_builddir) $(basename $<)
## Header files used when compiling some of the nat* files. ## Header files used when compiling some of the nat* files.
ordinary_nat_headers = $(ordinary_java_source_files:.java=.h) \ ordinary_nat_headers = $(ordinary_java_source_files:.java=.h) \
...@@ -272,13 +272,13 @@ x_nat_headers = $(x_java_source_files:.java=.h) ...@@ -272,13 +272,13 @@ x_nat_headers = $(x_java_source_files:.java=.h)
$(ordinary_nat_headers) $(x_nat_headers): %.h: %.class $(ordinary_nat_headers) $(x_nat_headers): %.h: %.class
java/lang/ClassLoader.h: java/lang/ClassLoader.class java/lang/ClassLoader.h: java/lang/ClassLoader.class
$(GCJH) -classpath $(top_builddir) \ $(GCJH) -CLASSPATH $(top_builddir) \
-friend 'jclass _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \ -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);' \ -friend 'void _Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, bool is_jar);' \
$(basename $<) $(basename $<)
java/lang/Thread.h: java/lang/Thread.class java/lang/Thread.h: java/lang/Thread.class
$(GCJH) -classpath $(top_builddir) \ $(GCJH) -CLASSPATH $(top_builddir) \
-prepend 'class _Jv_JNIEnv;' \ -prepend 'class _Jv_JNIEnv;' \
-prepend '#define _JV_NOT_OWNER 1' \ -prepend '#define _JV_NOT_OWNER 1' \
-prepend '#define _JV_INTERRUPTED 2' \ -prepend '#define _JV_INTERRUPTED 2' \
...@@ -291,7 +291,7 @@ java/lang/Thread.h: java/lang/Thread.class ...@@ -291,7 +291,7 @@ java/lang/Thread.h: java/lang/Thread.class
$(basename $<) $(basename $<)
java/lang/String.h: java/lang/String.class java/lang/String.h: java/lang/String.class
$(GCJH) -classpath $(top_builddir) \ $(GCJH) -CLASSPATH $(top_builddir) \
-friend 'jchar* _Jv_GetStringChars (jstring str);' \ -friend 'jchar* _Jv_GetStringChars (jstring str);' \
-friend 'jstring* _Jv_StringFindSlot (jchar*, jint, jint);' \ -friend 'jstring* _Jv_StringFindSlot (jchar*, jint, jint);' \
-friend 'jstring* _Jv_StringGetSlot (jstring);' \ -friend 'jstring* _Jv_StringGetSlot (jstring);' \
...@@ -301,21 +301,21 @@ java/lang/String.h: java/lang/String.class ...@@ -301,21 +301,21 @@ java/lang/String.h: java/lang/String.class
$(basename $<) $(basename $<)
java/lang/reflect/Constructor.h: java/lang/reflect/Constructor.class java/lang/reflect/Constructor.h: java/lang/reflect/Constructor.class
$(GCJH) -classpath $(top_builddir) \ $(GCJH) -CLASSPATH $(top_builddir) \
-friend 'jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);' \ -friend 'jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);' \
-friend 'class java::lang::Class;' \ -friend 'class java::lang::Class;' \
-friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \ -friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
$(basename $<) $(basename $<)
java/lang/reflect/Field.h: java/lang/reflect/Field.class java/lang/reflect/Field.h: java/lang/reflect/Field.class
$(GCJH) -classpath $(top_builddir) \ $(GCJH) -CLASSPATH $(top_builddir) \
-friend 'jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);' \ -friend 'jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);' \
-friend 'jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \ -friend 'jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \
-friend 'class java::lang::Class;' \ -friend 'class java::lang::Class;' \
$(basename $<) $(basename $<)
java/lang/reflect/Method.h: java/lang/reflect/Method.class java/lang/reflect/Method.h: java/lang/reflect/Method.class
$(GCJH) -classpath $(top_builddir) \ $(GCJH) -CLASSPATH $(top_builddir) \
-friend 'jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);' \ -friend 'jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);' \
-friend 'class java::lang::Class;' \ -friend 'class java::lang::Class;' \
-friend 'class java::io::ObjectInputStream;' \ -friend 'class java::io::ObjectInputStream;' \
...@@ -323,16 +323,16 @@ java/lang/reflect/Method.h: java/lang/reflect/Method.class ...@@ -323,16 +323,16 @@ java/lang/reflect/Method.h: java/lang/reflect/Method.class
$(basename $<) $(basename $<)
gnu/gcj/runtime/VMClassLoader.h: gnu/gcj/runtime/VMClassLoader.class gnu/gcj/runtime/VMClassLoader.h: gnu/gcj/runtime/VMClassLoader.class
$(GCJH) -classpath $(top_builddir) \ $(GCJH) -CLASSPATH $(top_builddir) \
-friend 'class ::java::lang::ClassLoader;' \ -friend 'class ::java::lang::ClassLoader;' \
$(basename $<) $(basename $<)
java/io/ObjectInputStream$$GetField.h: java/io/ObjectInputStream.class java/io/ObjectInputStream$$GetField.h: java/io/ObjectInputStream.class
$(GCJH) -classpath $(top_builddir) \ $(GCJH) -CLASSPATH $(top_builddir) \
'java/io/ObjectInputStream$$GetField' 'java/io/ObjectInputStream$$GetField'
java/io/ObjectOutputStream$$PutField.h: java/io/ObjectOutputStream.class java/io/ObjectOutputStream$$PutField.h: java/io/ObjectOutputStream.class
$(GCJH) -classpath $(top_builddir) \ $(GCJH) -CLASSPATH $(top_builddir) \
'java/io/ObjectOutputStream$$PutField' 'java/io/ObjectOutputStream$$PutField'
## Headers we maintain by hand and which we want to install. ## Headers we maintain by hand and which we want to install.
......
libjava/Makefile.in
...@@ -833,6 +833,7 @@ java/lang/SecurityException.java \ ...@@ -833,6 +833,7 @@ java/lang/SecurityException.java \
java/lang/SecurityManager.java \ java/lang/SecurityManager.java \
java/lang/Short.java \ java/lang/Short.java \
java/lang/StackOverflowError.java \ java/lang/StackOverflowError.java \
java/lang/StrictMath.java \
java/lang/String.java \ java/lang/String.java \
java/lang/StringBuffer.java \ java/lang/StringBuffer.java \
java/lang/StringIndexOutOfBoundsException.java \ java/lang/StringIndexOutOfBoundsException.java \
...@@ -1719,7 +1720,7 @@ libgcj-test.spec.in libgcj.spec.in ...@@ -1719,7 +1720,7 @@ libgcj-test.spec.in libgcj.spec.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar TAR = tar
GZIP_ENV = --best GZIP_ENV = --best
DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include
DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
...@@ -2244,8 +2245,8 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ ...@@ -2244,8 +2245,8 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/java/lang/Runtime.P .deps/java/lang/RuntimeException.P \ .deps/java/lang/Runtime.P .deps/java/lang/RuntimeException.P \
.deps/java/lang/RuntimePermission.P .deps/java/lang/SecurityException.P \ .deps/java/lang/RuntimePermission.P .deps/java/lang/SecurityException.P \
.deps/java/lang/SecurityManager.P .deps/java/lang/Short.P \ .deps/java/lang/SecurityManager.P .deps/java/lang/Short.P \
.deps/java/lang/StackOverflowError.P .deps/java/lang/String.P \ .deps/java/lang/StackOverflowError.P .deps/java/lang/StrictMath.P \
.deps/java/lang/StringBuffer.P \ .deps/java/lang/String.P .deps/java/lang/StringBuffer.P \
.deps/java/lang/StringIndexOutOfBoundsException.P \ .deps/java/lang/StringIndexOutOfBoundsException.P \
.deps/java/lang/System.P .deps/java/lang/Thread.P \ .deps/java/lang/System.P .deps/java/lang/Thread.P \
.deps/java/lang/ThreadDeath.P .deps/java/lang/ThreadGroup.P \ .deps/java/lang/ThreadDeath.P .deps/java/lang/ThreadGroup.P \
...@@ -3211,8 +3212,8 @@ libgcj.jar: $(built_java_source_files) $(java_source_files) $(x_java_source_file ...@@ -3211,8 +3212,8 @@ libgcj.jar: $(built_java_source_files) $(java_source_files) $(x_java_source_file
@set fnord $(MAKEFLAGS); amf=$$2; fail=no; \ @set fnord $(MAKEFLAGS); amf=$$2; fail=no; \
javac="$(JAVAC)"; \ javac="$(JAVAC)"; \
cat tmp-list | (while read f; do \ cat tmp-list | (while read f; do \
echo $$javac $(JCFLAGS) -classpath $(here):$(srcdir) -d $(here) $$f; \ echo $$javac $(JCFLAGS) -CLASSPATH $(here):$(srcdir) -d $(here) $$f; \
$$javac $(JCFLAGS) -classpath $(here):$(srcdir) -d $(here) $$f \ $$javac $(JCFLAGS) -CLASSPATH $(here):$(srcdir) -d $(here) $$f \
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes ;; *) exit 1;; esac; \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes ;; *) exit 1;; esac; \
done; \ done; \
test "$$fail" = no) test "$$fail" = no)
...@@ -3259,18 +3260,18 @@ libgcjx.la: $(libgcjx_la_OBJECTS) $(libgcjx_la_DEPENDENCIES) ...@@ -3259,18 +3260,18 @@ libgcjx.la: $(libgcjx_la_OBJECTS) $(libgcjx_la_DEPENDENCIES)
-rpath $(toolexeclibdir) $(libgcjx_la_LDFLAGS) $(LIBS) -rpath $(toolexeclibdir) $(libgcjx_la_LDFLAGS) $(LIBS)
.class.h: .class.h:
$(GCJH) -classpath $(top_builddir) $(basename $<) $(GCJH) -CLASSPATH $(top_builddir) $(basename $<)
$(ordinary_nat_headers) $(x_nat_headers): %.h: %.class $(ordinary_nat_headers) $(x_nat_headers): %.h: %.class
java/lang/ClassLoader.h: java/lang/ClassLoader.class java/lang/ClassLoader.h: java/lang/ClassLoader.class
$(GCJH) -classpath $(top_builddir) \ $(GCJH) -CLASSPATH $(top_builddir) \
-friend 'jclass _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \ -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);' \ -friend 'void _Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, bool is_jar);' \
$(basename $<) $(basename $<)
java/lang/Thread.h: java/lang/Thread.class java/lang/Thread.h: java/lang/Thread.class
$(GCJH) -classpath $(top_builddir) \ $(GCJH) -CLASSPATH $(top_builddir) \
-prepend 'class _Jv_JNIEnv;' \ -prepend 'class _Jv_JNIEnv;' \
-prepend '#define _JV_NOT_OWNER 1' \ -prepend '#define _JV_NOT_OWNER 1' \
-prepend '#define _JV_INTERRUPTED 2' \ -prepend '#define _JV_INTERRUPTED 2' \
...@@ -3283,7 +3284,7 @@ java/lang/Thread.h: java/lang/Thread.class ...@@ -3283,7 +3284,7 @@ java/lang/Thread.h: java/lang/Thread.class
$(basename $<) $(basename $<)
java/lang/String.h: java/lang/String.class java/lang/String.h: java/lang/String.class
$(GCJH) -classpath $(top_builddir) \ $(GCJH) -CLASSPATH $(top_builddir) \
-friend 'jchar* _Jv_GetStringChars (jstring str);' \ -friend 'jchar* _Jv_GetStringChars (jstring str);' \
-friend 'jstring* _Jv_StringFindSlot (jchar*, jint, jint);' \ -friend 'jstring* _Jv_StringFindSlot (jchar*, jint, jint);' \
-friend 'jstring* _Jv_StringGetSlot (jstring);' \ -friend 'jstring* _Jv_StringGetSlot (jstring);' \
...@@ -3293,78 +3294,38 @@ java/lang/String.h: java/lang/String.class ...@@ -3293,78 +3294,38 @@ java/lang/String.h: java/lang/String.class
$(basename $<) $(basename $<)
java/lang/reflect/Constructor.h: java/lang/reflect/Constructor.class java/lang/reflect/Constructor.h: java/lang/reflect/Constructor.class
$(GCJH) -classpath $(top_builddir) \ $(GCJH) -CLASSPATH $(top_builddir) \
-friend 'jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);' \ -friend 'jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);' \
-friend 'class java::lang::Class;' \ -friend 'class java::lang::Class;' \
-friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \ -friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
$(basename $<) $(basename $<)
java/lang/reflect/Field.h: java/lang/reflect/Field.class java/lang/reflect/Field.h: java/lang/reflect/Field.class
$(GCJH) -classpath $(top_builddir) \ $(GCJH) -CLASSPATH $(top_builddir) \
-friend 'jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);' \ -friend 'jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);' \
-friend 'jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \ -friend 'jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \
-friend 'class java::lang::Class;' \ -friend 'class java::lang::Class;' \
$(basename $<) $(basename $<)
java/lang/reflect/Method.h: java/lang/reflect/Method.class java/lang/reflect/Method.h: java/lang/reflect/Method.class
$(GCJH) -classpath $(top_builddir) \ $(GCJH) -CLASSPATH $(top_builddir) \
-friend 'jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);' \ -friend 'jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);' \
-friend 'class java::lang::Class;' \ -friend 'class java::lang::Class;' \
-friend 'class java::io::ObjectInputStream;' \ -friend 'class java::io::ObjectInputStream;' \
-friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \ -friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
$(basename $<) $(basename $<)
java/lang/Boolean.h: java/lang/Boolean.class
$(GCJH) -classpath $(top_builddir) \
-friend 'class java::lang::reflect::Method;' \
$(basename $<)
java/lang/Byte.h: java/lang/Byte.class
$(GCJH) -classpath $(top_builddir) \
-friend 'class java::lang::reflect::Method;' \
$(basename $<)
java/lang/Short.h: java/lang/Short.class
$(GCJH) -classpath $(top_builddir) \
-friend 'class java::lang::reflect::Method;' \
$(basename $<)
java/lang/Character.h: java/lang/Character.class
$(GCJH) -classpath $(top_builddir) \
-friend 'class java::lang::reflect::Method;' \
$(basename $<)
java/lang/Integer.h: java/lang/Integer.class
$(GCJH) -classpath $(top_builddir) \
-friend 'class java::lang::reflect::Method;' \
$(basename $<)
java/lang/Long.h: java/lang/Long.class
$(GCJH) -classpath $(top_builddir) \
-friend 'class java::lang::reflect::Method;' \
$(basename $<)
java/lang/Float.h: java/lang/Float.class
$(GCJH) -classpath $(top_builddir) \
-friend 'class java::lang::reflect::Method;' \
$(basename $<)
java/lang/Double.h: java/lang/Double.class
$(GCJH) -classpath $(top_builddir) \
-friend 'class java::lang::reflect::Method;' \
$(basename $<)
gnu/gcj/runtime/VMClassLoader.h: gnu/gcj/runtime/VMClassLoader.class gnu/gcj/runtime/VMClassLoader.h: gnu/gcj/runtime/VMClassLoader.class
$(GCJH) -classpath $(top_builddir) \ $(GCJH) -CLASSPATH $(top_builddir) \
-friend 'class ::java::lang::ClassLoader;' \ -friend 'class ::java::lang::ClassLoader;' \
$(basename $<) $(basename $<)
java/io/ObjectInputStream$$GetField.h: java/io/ObjectInputStream.class java/io/ObjectInputStream$$GetField.h: java/io/ObjectInputStream.class
$(GCJH) -classpath $(top_builddir) \ $(GCJH) -CLASSPATH $(top_builddir) \
'java/io/ObjectInputStream$$GetField' 'java/io/ObjectInputStream$$GetField'
java/io/ObjectOutputStream$$PutField.h: java/io/ObjectOutputStream.class java/io/ObjectOutputStream$$PutField.h: java/io/ObjectOutputStream.class
$(GCJH) -classpath $(top_builddir) \ $(GCJH) -CLASSPATH $(top_builddir) \
'java/io/ObjectOutputStream$$PutField' 'java/io/ObjectOutputStream$$PutField'
$(extra_headers): $(extra_headers):
......
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