From: Anthony Gutierrez <atgutier@umich.edu>
Date: Tue, 1 Apr 2014 16:35:31 +0000 (-0400)
Subject: arm: fix typos in makefile for ARM m5 util and link statically
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8d665ee166bf5476bb9b73a0016843ff9953c266;p=gem5.git

arm: fix typos in makefile for ARM m5 util and link statically

1) fixes a typo for clean target libgemOpJni.so -> libgem5OpJni.so
2) addes jni_gem5Op.h to clean since it is added during make
3) links the m5 utility statically since it won't work on some images otherwise
---

diff --git a/util/m5/Makefile.arm b/util/m5/Makefile.arm
index 99e95cc90..ca1bac5c2 100644
--- a/util/m5/Makefile.arm
+++ b/util/m5/Makefile.arm
@@ -55,7 +55,7 @@ JR=jar
 #JDK_PATH=/path/to/jdk/version_number
 
 CFLAGS=-O2 -I $(JDK_PATH)/include/ -I $(JDK_PATH)/include/linux -march=armv7-a
-LDFLAGS=-L. -lm5
+LDFLAGS=-L. -lm5 -static
 
 LIB_OBJS=m5op_arm.o
 OBJS=m5.o
@@ -84,4 +84,5 @@ gem5OpJni.jar:
 	$(JR) cvf $@ jni/*.class
 
 clean:
-	rm -f *.o m5 libgemOpJni.so gem5OpJni.jar jni/*.class libm5.a
+	rm -f *.o m5 libgem5OpJni.so gem5OpJni.jar jni/*.class libm5.a \
+	jni_gem5Op.h