util: Update the m5 util Makefiles to not use javah.

In more recent versions of the JDK, the javah tool has been dropped. The
same job can be accomplished by passing a -h option to javac, telling it
where to put the header files javah would have generated.

Change-Id: Ibc543d5fa222848458f45b1945f8050b85b77ca2
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27210
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>

diff --git a/util/m5/src/Makefile.aarch64 b/util/m5/src/Makefile.aarch64
index c1c084d006bf069d27c041db73f18e048f497be2..7724b85fcdbd4b9ce65650c9a4e219ffd91c67ea 100644 (file)
--- a/util/m5/src/Makefile.aarch64
+++ b/util/m5/src/Makefile.aarch64
@@ -46,7 +46,6 @@ LD=$(CROSS_COMPILE)ld
 AR=$(CROSS_COMPILE)ar
 
 JC=javac
-JH=javah
 JR=jar
 ### JDK_PATH must be set to build gem5OpJni
 #JDK_PATH=/path/to/jdk/version_number
@@ -81,8 +80,7 @@ gem5OpJni: gem5OpJni.jar $(JNI_OBJS)
        $(CC) --shared -o lib$@.so $(JNI_OBJS)
 
 gem5OpJni.jar:
-       $(JC) jni/gem5Op.java; \
-       $(JH) jni.gem5Op; \
+       $(JC) jni/gem5Op.java -h .; \
        $(JR) cvf $@ jni/*.class
 
 lua_gem5Op.o: lua_gem5Op.c

diff --git a/util/m5/src/Makefile.arm b/util/m5/src/Makefile.arm
index 042cf00696974c7b2819a6fdc1fbe0bc6c362fb8..2588f09c6c49106267c7be73e422c85a5680e2a7 100644 (file)
--- a/util/m5/src/Makefile.arm
+++ b/util/m5/src/Makefile.arm
@@ -46,7 +46,6 @@ LD=$(CROSS_COMPILE)ld
 AR=$(CROSS_COMPILE)ar
 
 JC=javac
-JH=javah
 JR=jar
 ### JDK_PATH must be set to build gem5OpJni
 #JDK_PATH=/path/to/jdk/version_number
@@ -82,8 +81,7 @@ gem5OpJni: gem5OpJni.jar $(JNI_OBJS)
        $(CC) --shared -o lib$@.so $(JNI_OBJS)
 
 gem5OpJni.jar:
-       $(JC) jni/gem5Op.java; \
-       $(JH) jni.gem5Op; \
+       $(JC) jni/gem5Op.java -h .; \
        $(JR) cvf $@ jni/*.class
 
 lua_gem5Op.o: lua_gem5Op.c