瀏覽代碼

Merge pull request #115 from JuliaLang/sb/arm

Set optimisation on ARM to -O0, which stops tests from hanging.
Simon Byrne 9 年之前
父節點
當前提交
39bfc468bc
共有 1 個文件被更改,包括 10 次插入8 次删除
  1. 10 8
      Make.inc

+ 10 - 8
Make.inc

@@ -47,14 +47,6 @@ endif
 
 CFLAGS_add += -std=c99 -Wall -I$(OPENLIBM_HOME) -I$(OPENLIBM_HOME)/include -I$(OPENLIBM_HOME)/ld80 -I$(OPENLIBM_HOME)/$(ARCH) -I$(OPENLIBM_HOME)/src -DASSEMBLER -D__BSD_VISIBLE -Wno-implicit-function-declaration
 
-# The optimization flag may be overriden with the environment variable CFLAGS.
-ifeq ($(ARCH),powerpc)
-# tests hang at higher optimization levels
-CFLAGS ?= -O0
-else
-CFLAGS ?= -O2
-endif
-
 default: all
 
 %.c.o: %.c
@@ -85,6 +77,16 @@ ifeq ($(ARCH),x86_64)
 override ARCH := amd64
 endif
 
+# The optimization flag may be overriden with the environment variable CFLAGS.
+ifeq ($(ARCH),powerpc)
+# tests hang at higher optimization levels
+CFLAGS ?= -O0
+else if ($(ARCH),arm)
+CFLAGS ?= -O0
+else
+CFLAGS ?= -O2
+endif
+
 ifneq (,$(findstring MINGW,$(OS)))
 override OS=WINNT
 endif