summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoffer Dall <cdall@cs.columbia.edu>2011-05-06 15:59:37 +0200
committerChristoffer Dall <cdall@cs.columbia.edu>2011-05-06 16:12:34 +0200
commit91fe082326b74c6e88cd9a84e865c9f8b1f5258c (patch)
treedeeb94010e06f55d01745cd5a4dad5397fa4c9a9
parent0d619da1d390944350535acee9d0c1a49b887a29 (diff)
Conditionally set CROSS_COMPILE and use sec. ext.
Only set CROSS_COMPILE if it's not already set in the environment and set it to arm-unknown-eabi- per default. Set "arch_extension sec" in boot.S code to allow newer compilers to accept the smc #0 instruction.
-rw-r--r--Makefile2
-rw-r--r--boot.S1
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 784f8cd..6dc9912 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ FILESYSTEM = filesystem.cpio.gz
IMAGE = linux-system.axf
LD_SCRIPT = model.lds.S
-CROSS_COMPILE = arm-none-linux-gnueabi-
+CROSS_COMPILE ?= arm-unknown-eabi-
CC = $(CROSS_COMPILE)gcc
LD = $(CROSS_COMPILE)ld
diff --git a/boot.S b/boot.S
index 1a906d7..1c803ac 100644
--- a/boot.S
+++ b/boot.S
@@ -8,6 +8,7 @@
*/
.syntax unified
+ .arch_extension sec
.text
.globl _start