From 031d261fe1d8d7ecb6d2946a1f719ce9f3d58448 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 24 Mar 2020 00:56:29 -0700 Subject: [PATCH] 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 Tested-by: kokoro Reviewed-by: Daniel Carvalho --- util/m5/src/Makefile.aarch64 | 4 +--- util/m5/src/Makefile.arm | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/util/m5/src/Makefile.aarch64 b/util/m5/src/Makefile.aarch64 index c1c084d00..7724b85fc 100644 --- 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 042cf0069..2588f09c6 100644 --- 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 -- 2.30.2