summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Gutierrez <atgutier@umich.edu>2013-08-14 10:51:47 -0400
committerAnthony Gutierrez <atgutier@umich.edu>2013-08-14 10:51:47 -0400
commitcf56619b0ce0f6dc4cf3ee8af57533c169fb0123 (patch)
tree8391de596195eb0df5fc75d85f6d4f4d6f9af131
parent95381f8a990f2cf8806da4e653a9770c4dfe6f6a (diff)
downloadgem5-cf56619b0ce0f6dc4cf3ee8af57533c169fb0123.tar.xz
arm: use -march when compiling m5op_arm.S
Using arm-linux-gnueabi-gcc 4.7.3-1ubuntu1 on Ubuntu 13.04 to compiled the m5 binary yields the error: m5op_arm.S: Assembler messages: m5op_arm.S:85: Error: selected processor does not support ARM mode `bxj lr' For each of of the SIMPLE_OPs. Apparently, this compiler doesn't like the interworking of these code types for the default arch. Adding -march=armv7-a makes it compile. Another alternative that I found to work is replacing the bxj lr instruction with mov pc, lr, but I don't know how that affects the KVM stuff and if bxj is needed.
-rw-r--r--util/m5/Makefile.arm4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/m5/Makefile.arm b/util/m5/Makefile.arm
index fd6e8938c..99e95cc90 100644
--- a/util/m5/Makefile.arm
+++ b/util/m5/Makefile.arm
@@ -39,7 +39,7 @@
# Authors: Nathan Binkert
# Ali Saidi
-### If we are not compiling on an arm, we must use cross tools ###
+### If we are not compiling on an arm, we must use cross tools ###
ifneq ($(shell uname -m), armv7l)
CROSS_COMPILE?=arm-linux-gnueabi-
endif
@@ -54,7 +54,7 @@ JR=jar
### JDK_PATH must be set to build gem5OpJni
#JDK_PATH=/path/to/jdk/version_number
-CFLAGS=-O2 -I $(JDK_PATH)/include/ -I $(JDK_PATH)/include/linux
+CFLAGS=-O2 -I $(JDK_PATH)/include/ -I $(JDK_PATH)/include/linux -march=armv7-a
LDFLAGS=-L. -lm5
LIB_OBJS=m5op_arm.o