derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Gabe Black
2020-03-24 00:56:29 -07:00
parent a959f28ec9
commit 031d261fe1
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
util/m5/src/Makefile.aarch64
View File

@@ -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

4
util/m5/src/Makefile.arm
View File

@@ -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