Cross compiler prefix variable was changed

Many cross compilable softwares use variable
"$(CROSS_COMPILE)" insteed "$(CROSS)".
If fit this rule, we not need special variable knowledge.

diff --git a/src/target/armadillo/Makefile b/src/target/armadillo/Makefile
index 32374df..df371c0 100644 (file)
--- a/src/target/armadillo/Makefile
+++ b/src/target/armadillo/Makefile
@@ -34,10 +34,10 @@ endif
 BUILD_NAME := $(shell $(NCVT) -c "-" loader $(TARGET) $(.PROFILE) v$(HERMIT_VERSION))
 BUILD_TARGETS := $(BUILD_NAME).bin
 
-CROSS := arm-linux-
-GCC_VER := $(shell $(CROSS)gcc -dumpversion | sed "s/\..*//")
+CROSS_COMPILE ?= arm-linux-
+GCC_VER := $(shell $(CROSS_COMPILE)gcc -dumpversion | sed "s/\..*//")
 INCLUDEDIR := ../../../include
-CC := $(CROSS)gcc
+CC := $(CROSS_COMPILE)gcc
 CFLAGS := -Wall -O2 -fomit-frame-pointer -I$(INCLUDEDIR) -nostdlib \
        -mcpu=arm7tdmi -static
 CFLAGS += -DARMADILLO -DENABLE_MEDIUM_ETHERNET
@@ -117,7 +117,7 @@ $(BUILD_NAME).lds: $(wildcard loader.lds.*)
        cp loader.lds.$(LDSCRIPT) $@
 
 %.bin: %.elf
-       $(CROSS)objcopy $(OBJCOPYFLAGS) $< $@
+       $(CROSS_COMPILE)objcopy $(OBJCOPYFLAGS) $< $@
 
 # automated dependency checking
 ifeq (,$(filter clean scrub,$(MAKECMDGOALS)))

diff --git a/src/target/armadillo2x0/Makefile b/src/target/armadillo2x0/Makefile
index 8f96646..3edbbe2 100644 (file)
--- a/src/target/armadillo2x0/Makefile
+++ b/src/target/armadillo2x0/Makefile
@@ -34,10 +34,10 @@ endif
 BUILD_NAME := $(shell $(NCVT) -c "-" loader $(TARGET) $(.PROFILE) v$(HERMIT_VERSION))
 BUILD_TARGETS := $(BUILD_NAME).bin
 
-CROSS := arm-linux-
-GCC_VER := $(shell $(CROSS)gcc -dumpversion | sed "s/\..*//")
+CROSS_COMPILE ?= arm-linux-
+GCC_VER := $(shell $(CROSS_COMPILE)gcc -dumpversion | sed "s/\..*//")
 INCLUDEDIR := ../../../include
-CC := $(CROSS)gcc
+CC := $(CROSS_COMPILE)gcc
 CFLAGS := -Wall -O2 -fomit-frame-pointer -I$(INCLUDEDIR) -nostdlib \
        -DHERMIT_VERSION='"$(HERMIT_VERSION)"' \
        -march=armv4 -mtune=arm9tdmi -static
@@ -164,7 +164,7 @@ $(BUILD_NAME).lds: $(wildcard loader.lds.*)
        cp loader.lds.$(LDSCRIPT) $@
 
 %.bin: %.elf
-       $(CROSS)objcopy $(OBJCOPYFLAGS) $< $@
+       $(CROSS_COMPILE)objcopy $(OBJCOPYFLAGS) $< $@
 
 # automated dependency checking
 ifeq (,$(filter clean scrub,$(MAKECMDGOALS)))

diff --git a/src/target/armadillo3x0/Makefile b/src/target/armadillo3x0/Makefile
index 53dc691..7b8f4c4 100644 (file)
--- a/src/target/armadillo3x0/Makefile
+++ b/src/target/armadillo3x0/Makefile
@@ -34,10 +34,10 @@ endif
 BUILD_NAME := $(shell $(NCVT) -c "-" loader $(TARGET) $(.PROFILE) v$(HERMIT_VERSION))
 BUILD_TARGETS := $(BUILD_NAME).bin
 
-CROSS := arm-linux-
+CROSS_COMPILE ?= arm-linux-
 GCC_VER := $(shell $(CROSS)gcc -dumpversion | sed "s/\..*//")
 INCLUDEDIR := ../../../include
-CC := $(CROSS)gcc
+CC := $(CROSS_COMPILE)gcc
 CFLAGS := -Wall -O2 -fomit-frame-pointer -I$(INCLUDEDIR) -nostdlib \
        -DHERMIT_VERSION='"$(HERMIT_VERSION)"' \
        -march=armv5te -mtune=arm9tdmi -static
@@ -139,7 +139,7 @@ $(BUILD_NAME).lds: $(wildcard loader.lds.*)
        cp loader.lds.$(LDSCRIPT) $@
 
 %.bin: %.elf
-       $(CROSS)objcopy $(OBJCOPYFLAGS) $< $@
+       $(CROSS_COMPILE)objcopy $(OBJCOPYFLAGS) $< $@
 
 # automated dependency checking
 ifeq (,$(filter clean scrub,$(MAKECMDGOALS)))

diff --git a/src/target/armadillo5x0/Makefile b/src/target/armadillo5x0/Makefile
index b5851bf..bec695b 100644 (file)
--- a/src/target/armadillo5x0/Makefile
+++ b/src/target/armadillo5x0/Makefile
@@ -37,10 +37,10 @@ cc-option = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
 BUILD_NAME := $(shell $(NCVT) -c "-" loader $(TARGET) $(.PROFILE) v$(HERMIT_VERSION))
 BUILD_TARGETS := $(BUILD_NAME).bin
 
-CROSS := arm-linux-
-GCC_VER := $(shell $(CROSS)gcc -dumpversion | sed "s/\..*//")
+CROSS_COMPILE ?= arm-linux-
+GCC_VER := $(shell $(CROSS_COMPILE)gcc -dumpversion | sed "s/\..*//")
 INCLUDEDIR := ../../../include
-CC := $(CROSS)gcc
+CC := $(CROSS_COMPILE)gcc
 MARCH := $(call cc-option, -march=armv6, -march=armv5t)
 MTUNE := $(firstword \
                $(call cc-option, -mtune=arm1136jf-s) \
@@ -166,7 +166,7 @@ $(BUILD_NAME).lds: $(wildcard loader.lds.*)
        $(CPP) -P -x assembler-with-cpp $(CFLAGS) loader.lds.$(LDSCRIPT) > $@
 
 %.bin: %.elf
-       $(CROSS)objcopy $(OBJCOPYFLAGS) $< $@
+       $(CROSS_COMPILE)objcopy $(OBJCOPYFLAGS) $< $@
 
 # automated dependency checking
 ifeq (,$(filter clean scrub,$(MAKECMDGOALS)))

diff --git a/src/target/armadillo9/Makefile b/src/target/armadillo9/Makefile
index f6fe86e..a454362 100644 (file)
--- a/src/target/armadillo9/Makefile
+++ b/src/target/armadillo9/Makefile
@@ -34,10 +34,10 @@ endif
 BUILD_NAME := $(shell $(NCVT) -c "-" loader $(TARGET) $(.PROFILE) v$(HERMIT_VERSION))
 BUILD_TARGETS := $(BUILD_NAME).bin
 
-CROSS := arm-linux-
-GCC_VER := $(shell $(CROSS)gcc -dumpversion | sed "s/\..*//")
+CROSS_COMPILE ?= arm-linux-
+GCC_VER := $(shell $(CROSS_COMPILE)gcc -dumpversion | sed "s/\..*//")
 INCLUDEDIR := ../../../include
-CC := $(CROSS)gcc
+CC := $(CROSS_COMPILE)gcc
 CFLAGS := -Wall -O2 -fomit-frame-pointer -I$(INCLUDEDIR) -nostdlib \
        -DHERMIT_VERSION='"$(HERMIT_VERSION)"' \
        -march=armv4 -mtune=arm9tdmi -static
@@ -161,7 +161,7 @@ $(BUILD_NAME).lds: $(wildcard loader.lds.*)
        cp loader.lds.$(LDSCRIPT) $@
 
 %.bin: %.elf
-       $(CROSS)objcopy $(OBJCOPYFLAGS) $< $@
+       $(CROSS_COMPILE)objcopy $(OBJCOPYFLAGS) $< $@
 
 # automated dependency checking
 ifeq (,$(filter clean scrub,$(MAKECMDGOALS)))

diff --git a/src/target/armadilloj/Makefile b/src/target/armadilloj/Makefile
index 6aa5e43..af3eefb 100644 (file)
--- a/src/target/armadilloj/Makefile
+++ b/src/target/armadilloj/Makefile
@@ -37,10 +37,10 @@ endif
 BUILD_NAME := $(shell $(NCVT) -c "-" loader $(TARGET) $(.PROFILE) v$(HERMIT_VERSION))
 BUILD_TARGETS := $(BUILD_NAME).bin
 
-CROSS := arm-elf-
-GCC_VER := $(shell $(CROSS)gcc -dumpversion | sed "s/\..*//")
+CROSS_COMPILE ?= arm-elf-
+GCC_VER := $(shell $(CROSS_COMPILE)gcc -dumpversion | sed "s/\..*//")
 INCLUDEDIR := ../../../include
-CC := $(CROSS)gcc
+CC := $(CROSS_COMPILE)gcc
 CFLAGS := -Wall -O2 -fomit-frame-pointer \
          -DHERMIT_VERSION='"$(HERMIT_VERSION)"' \
          -nostdlib -mcpu=arm7tdmi -static \
@@ -132,7 +132,7 @@ $(BUILD_NAME).lds: loader.lds
        $(CPP) -P -x assembler-with-cpp $(CFLAGS) $< > $@
 
 %.bin: %.elf
-       $(CROSS)objcopy $(OBJCOPYFLAGS) $< $@.pre
+       $(CROSS_COMPILE)objcopy $(OBJCOPYFLAGS) $< $@.pre
        if [ "$(BYTESWAP)" = "y" ]; then                \
                dd if=$@.pre of=$@ conv=swab ;          \
        else                                            \

diff --git a/src/target/common/Makefile b/src/target/common/Makefile
index 8e7b3f7..b4e8f40 100644 (file)
--- a/src/target/common/Makefile
+++ b/src/target/common/Makefile
@@ -12,17 +12,17 @@ ifeq ($(TARGET),suzaku)
                .PROFILE := $(PROFILE)
        endif
        ifeq ($(.PROFILE),microblaze)
-               CROSS := mb-
+               CROSS_COMPILE := mb-
        else
                ifeq ($(.PROFILE),powerpc)
-                       CROSS := powerpc-linux-
+                       CROSS_COMPILE := powerpc-linux-
                endif
        endif
 else
        ifeq ($(TARGET), armadilloj)
-               CROSS := arm-elf-
+               CROSS_COMPILE := arm-elf-
        else
-               CROSS := arm-linux-
+               CROSS_COMPILE := arm-linux-
                CROSSPREFIX := /usr/local/arm-linux
                LIBC := $(CROSSPREFIX)/lib/libc.a
        endif
@@ -36,13 +36,13 @@ ifeq ($(CFLAG_OPTIMIZE), )
 CFLAG_OPTIMIZE = -Os
 endif
 
-CC := $(CROSS)gcc
+CC := $(CROSS_COMPILE)gcc
 CFLAGS := -Wall $(CFLAG_OPTIMIZE) -fomit-frame-pointer \
        -DHERMIT_VERSION='"$(HERMIT_VERSION)"' \
        -nostdlib -I../../../include
 
 ARCHFLAGS :=
-ifeq ($(findstring arm,$(CROSS)),arm)
+ifeq ($(findstring arm,$(CROSS_COMPILE)),arm)
 ifeq ($(TARGET), armadillo9)
 ARCHFLAGS += -march=armv4 -mtune=arm9tdmi
 endif
@@ -90,8 +90,8 @@ DEPS := $(SRCS:.c=.d)
 all: libtarget.a
 
 libtarget.a: $(OBJS)
-       $(CROSS)ar cr $@ $(OBJS) 
-       $(CROSS)ranlib $@
+       $(CROSS_COMPILE)ar cr $@ $(OBJS) 
+       $(CROSS_COMPILE)ranlib $@
 
 # housecleaning
 .PHONY: clean