From: Gabe Black <gabe.black@gmail.com>
Date: Fri, 23 Oct 2020 03:00:53 +0000 (-0700)
Subject: util: Link m5_mmap into the JNI shared library for the m5 util.
X-Git-Tag: develop-gem5-snapshot~390
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=671d089676261149f836db10456afed5b895d2af;p=gem5.git

util: Link m5_mmap into the JNI shared library for the m5 util.

Change-Id: I6849a547e9150417a09f7a0efc73ebf032e44f3a
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/28174
Reviewed-by: Gabe Black <gabe.black@gmail.com>
Reviewed-by: Pouya Fotouhi <pfotouhi@ucdavis.edu>
Maintainer: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/util/m5/src/SConscript b/util/m5/src/SConscript
index 0f4749438..395abb921 100644
--- a/util/m5/src/SConscript
+++ b/util/m5/src/SConscript
@@ -112,7 +112,8 @@ if env['HAVE_JAVA']:
                      OUT=Dir('out'), CWD=Dir('.'))
     # Set include paths to the C headers from the JDK which scons found for us.
     java_env.Append(CPPPATH='${JAVAINCLUDES}')
-    java_env.SharedLibrary('out/gem5OpJni', [ jni ] + m5op_shared)
+    java_env.SharedLibrary('out/gem5OpJni',
+                           [ jni ] + m5op_shared + m5_mmap_shared)
 
 
 if env['HAVE_LUA51']: