equal
deleted
inserted
replaced
75 endif |
75 endif |
76 |
76 |
77 ifeq "$(CPU)" "arm" |
77 ifeq "$(CPU)" "arm" |
78 ASMINCPATH := . $(EPOCBLDABS) $(ASMINCPATH) $(EXTENSION_ROOT) $(EPOCCPUINC) |
78 ASMINCPATH := . $(EPOCBLDABS) $(ASMINCPATH) $(EXTENSION_ROOT) $(EPOCCPUINC) |
79 ARMASM_OUT := $(shell armasm 2>&1) |
79 ARMASM_OUT := $(shell armasm 2>&1) |
80 ARMASM_OUT_4 := $(word 4,$(ARMASM_OUT)) |
80 ARMASM_OUT_RVCT := $(wordlist 1,6,$(ARMASM_OUT)) |
81 ARMASM_OUT_6 := $(word 6,$(ARMASM_OUT)) |
81 ARMASM_OUT_6 := $(word 6,$(ARMASM_OUT)) |
82 |
82 |
83 # Use GCC toolchain if no other is available |
83 # Use GCC toolchain if no other is available |
84 TOOLVER := GCC |
84 TOOLVER := GCC |
85 |
85 |
86 RVCTSTR := $(strip $(findstring RVCT, $(ARMASM_OUT_4))) |
86 # ARM/Thumb Macro Assembler, RVCT2.2 [Build 616] |
|
87 # ARM Assembler, RVCT4.0 [Build 529] |
|
88 RVCTSTR := $(strip $(findstring RVCT, $(ARMASM_OUT_RVCT))) |
87 ifeq "$(RVCTSTR)" "RVCT" |
89 ifeq "$(RVCTSTR)" "RVCT" |
88 TOOLVER := RVCT |
90 TOOLVER := RVCT |
89 OP := -- |
91 OP := -- |
90 endif |
92 endif |
91 ifeq "$(ARMASM_OUT_6)" "2.37" |
93 ifeq "$(ARMASM_OUT_6)" "2.37" |