diff options
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | config.project | 2 | ||||
| -rw-r--r-- | config.usage | 4 | ||||
| -rwxr-xr-x | configure | 34 | ||||
| -rw-r--r-- | sysinfo/compiler/clang.mk | 48 | ||||
| -rw-r--r-- | sysinfo/compiler/cparser.mk (renamed from sysinfo/toolchain/cparser.mk) | 36 | ||||
| -rw-r--r-- | sysinfo/compiler/gcc.mk | 43 | ||||
| -rw-r--r-- | sysinfo/toolchain/clang.mk | 48 | ||||
| -rw-r--r-- | sysinfo/toolchain/gcc.mk | 43 |
9 files changed, 132 insertions, 132 deletions
diff --git a/Makefile.in b/Makefile.in index 2526718..d312838 100644 --- a/Makefile.in +++ b/Makefile.in @@ -5,7 +5,7 @@ BUILD = @build@ HOST = @host@ TARGET = @target@ ARCH = @arch@ -TOOLCHAIN = @toolchain@ +COMPILER = @compiler@ SYSROOT = @sysroot@ CROSS_COMPILE = @cross_compile@ SHELL = @shell@ @@ -59,7 +59,7 @@ static: include $(PROJECT_DIR)/sysinfo/host/$(HOST).mk -include $(PROJECT_DIR)/sysinfo/toolchain/$(TOOLCHAIN).mk +include $(PROJECT_DIR)/sysinfo/compiler/$(COMPILER).mk include $(PROJECT_DIR)/project/defs.mk include $(PROJECT_DIR)/project/tree.mk @@ -169,7 +169,7 @@ clean: @echo HOST:' '$(HOST) @echo TARGET:' '$(TARGET) @echo ARCH:' '$(ARCH) - @echo TOOLCHAIN:' '$(TOOLCHAIN) + @echo COMPILER:' '$(COMPILER) @echo SYSROOT:' '$(SYSROOT) @echo XCOMPILE:' '$(CROSS_COMPILE) @echo SHELL:' '$(SHELL) diff --git a/config.project b/config.project index 1bb2c87..cf6cd40 100644 --- a/config.project +++ b/config.project @@ -19,7 +19,7 @@ mb_default_build= mb_default_host= mb_default_target= mb_default_arch= -mb_default_toolchain= +mb_default_compiler= mb_default_sysroot= mb_default_cross_compile= mb_default_shell=sh diff --git a/config.usage b/config.usage index 2175510..ca4419c 100644 --- a/config.usage +++ b/config.usage @@ -16,7 +16,7 @@ supported switches: --host --target --arch - --toolchain + --compiler --sysroot --cross-compile --shell @@ -42,7 +42,7 @@ supported variables: HOST TARGET ARCH - TOOLCHAIN + COMPILER SYSROOT CROSS_COMPILE SHELL @@ -44,7 +44,7 @@ init_vars() mb_host=$HOST mb_target=$TARGET mb_arch=$ARCH - mb_toolchain=$TOOLCHAIN + mb_compiler=$COMPILER mb_sysroot=$SYSROOT mb_cross_compile=$CROSS_COMPILE mb_shell=$SHELL @@ -117,7 +117,7 @@ common_defaults() [ -z "$mb_host" ] && mb_host=$mb_default_host [ -z "$mb_target" ] && mb_target=$mb_default_target [ -z "$mb_arch" ] && mb_arch=$mb_default_arch - [ -z "$mb_toolchain" ] && mb_toolchain=$mb_default_toolchain + [ -z "$mb_compiler" ] && mb_compiler=$mb_default_compiler [ -z "$mb_sysroot" ] && mb_sysroot=$mb_default_sysroot [ -z "$mb_cross_compile" ] && mb_cross_compile=$mb_default_cross_compile [ -z "$mb_shell" ] && mb_shell=$mb_default_shell @@ -167,10 +167,10 @@ common_defaults() fi fi - # toolchain - if [ x"$mb_toolchain" != x ]; then + # compiler + if [ x"$mb_compiler" != x ]; then if [ x"$mb_native_cc" = x ]; then - mb_native_cc=$mb_toolchain + mb_native_cc=$mb_compiler fi fi } @@ -183,7 +183,7 @@ native_defaults() $CC -dM -E - < /dev/null > /dev/null || exit 2 fi - # toolchain + # compiler [ -z "$mb_native_cc" ] && mb_native_cc=$CC [ -z "$mb_native_cc" ] && mb_native_cc='cc' $mb_native_cc -dM -E - < /dev/null > /dev/null 2>/dev/null || mb_native_cc= @@ -202,19 +202,19 @@ native_defaults() exit 2 fi - if [ x"$mb_toolchain" = x ]; then - $mb_native_cc -dM -E - < /dev/null | grep '__clang__' > /dev/null && mb_toolchain='clang' + if [ x"$mb_compiler" = x ]; then + $mb_native_cc -dM -E - < /dev/null | grep '__clang__' > /dev/null && mb_compiler='clang' fi - if [ x"$mb_toolchain" = x ]; then - $mb_native_cc -dM -E - < /dev/null | grep '__GCC' > /dev/null && mb_toolchain='gcc' + if [ x"$mb_compiler" = x ]; then + $mb_native_cc -dM -E - < /dev/null | grep '__GCC' > /dev/null && mb_compiler='gcc' fi - if [ x"$mb_toolchain" = x ]; then - $mb_native_cc -dM -E - < /dev/null | grep '__CPARSER__' > /dev/null && mb_toolchain='cparser' + if [ x"$mb_compiler" = x ]; then + $mb_native_cc -dM -E - < /dev/null | grep '__CPARSER__' > /dev/null && mb_compiler='cparser' fi - if [ x"$mb_toolchain" = x ]; then + if [ x"$mb_compiler" = x ]; then error_msg "config error: could not identify the native compiler." exit 2 fi @@ -275,7 +275,7 @@ config_copy() -e 's^@host@^'"$mb_host"'^g' \ -e 's^@target@^'"$mb_target"'^g' \ -e 's^@arch@^'"$mb_arch"'^g' \ - -e 's^@toolchain@^'"$mb_toolchain"'^g' \ + -e 's^@compiler@^'"$mb_compiler"'^g' \ -e 's^@sysroot@^'"$mb_sysroot"'^g' \ -e 's^@cross_compile@^'"$mb_cross_compile"'^g' \ -e 's^@shell@^'"$mb_shell"'^g' \ @@ -330,7 +330,7 @@ config_host() make host.tag && return 0 error_msg "configure was able to generate a Makefile for the selected host," - error_msg "however the host-targeting toolchain was found to be missing" + error_msg "however the host-targeting compiler was found to be missing" error_msg "at least one of the required headers or features." exit 2 } @@ -391,8 +391,8 @@ for arg ; do --arch=*) mb_arch=${arg#*=} ;; - --toolchain=*) - mb_toolchain=${arg#*=} + --compiler=*) + mb_compiler=${arg#*=} ;; --sysroot=*) mb_sysroot=${arg#*=} diff --git a/sysinfo/compiler/clang.mk b/sysinfo/compiler/clang.mk new file mode 100644 index 0000000..a372dc4 --- /dev/null +++ b/sysinfo/compiler/clang.mk @@ -0,0 +1,48 @@ +ifeq ($(CROSS_COMPILE)x,x) + CROSS_HOST = + CROSS_HOST_SPEC = +else + CROSS_HOST = $(HOST) + CROSS_HOST_SPEC = --target=$(HOST) +endif + + +ifeq ($(USER_CC)x,x) + CC = $(NATIVE_CC) $(CROSS_HOST_SPEC) +else + CC = $(USER_CC) $(CROSS_HOST_SPEC) +endif + +ifeq ($(USER_CPP)x,x) + CPP = $(NATIVE_CC) $(CROSS_HOST_SPEC) -E +else + CPP = $(USER_CPP) $(CROSS_HOST_SPEC) -E +endif + +ifeq ($(USER_CXX)x,x) + CXX = $(NATIVE_CC)++ $(CROSS_HOST_SPEC) +else + CXX = $(USER_CXX) $(CROSS_HOST_SPEC) +endif + + +AS = $(CROSS_COMPILE)as +AR = $(CROSS_COMPILE)ar +LD = $(CROSS_COMPILE)ld +NM = $(CROSS_COMPILE)nm +OBJDUMP = $(CROSS_COMPILE)objdump +RANLIB = $(CROSS_COMPILE)ranlib +SIZE = $(CROSS_COMPILE)size +STRIP = $(CROSS_COMPILE)strip +STRINGS = $(CROSS_COMPILE)strings + + +ADDR2LINE = $(CROSS_COMPILE)addr2line +COV = $(CROSS_COMPILE)gcov +CXXFILT = $(CROSS_COMPILE)c++filt +ELFEDIT = $(CROSS_COMPILE)elfedit +OBJCOPY = $(CROSS_COMPILE)objcopy +READELF = $(CROSS_COMPILE)readelf + + +CFLAGS_PIC = -fPIC diff --git a/sysinfo/toolchain/cparser.mk b/sysinfo/compiler/cparser.mk index 762a6e6..eea15c3 100644 --- a/sysinfo/toolchain/cparser.mk +++ b/sysinfo/compiler/cparser.mk @@ -1,8 +1,8 @@ ifeq ($(CROSS_COMPILE)x,x) - CROSS_HOST = + CROSS_HOST = CROSS_HOST_SPEC = else - CROSS_HOST = $(HOST) + CROSS_HOST = $(HOST) CROSS_HOST_SPEC = --target=$(HOST) endif @@ -26,23 +26,23 @@ else endif -AS = $(CROSS_COMPILE)as -AR = $(CROSS_COMPILE)ar -LD = $(CROSS_COMPILE)ld -NM = $(CROSS_COMPILE)nm -OBJDUMP = $(CROSS_COMPILE)objdump -RANLIB = $(CROSS_COMPILE)ranlib -SIZE = $(CROSS_COMPILE)size -STRIP = $(CROSS_COMPILE)strip -STRINGS = $(CROSS_COMPILE)strings +AS = $(CROSS_COMPILE)as +AR = $(CROSS_COMPILE)ar +LD = $(CROSS_COMPILE)ld +NM = $(CROSS_COMPILE)nm +OBJDUMP = $(CROSS_COMPILE)objdump +RANLIB = $(CROSS_COMPILE)ranlib +SIZE = $(CROSS_COMPILE)size +STRIP = $(CROSS_COMPILE)strip +STRINGS = $(CROSS_COMPILE)strings -ADDR2LINE = $(CROSS_COMPILE)addr2line -COV = $(CROSS_COMPILE)gcov -CXXFILT = $(CROSS_COMPILE)c++filt -ELFEDIT = $(CROSS_COMPILE)elfedit -OBJCOPY = $(CROSS_COMPILE)objcopy -READELF = $(CROSS_COMPILE)readelf +ADDR2LINE = $(CROSS_COMPILE)addr2line +COV = $(CROSS_COMPILE)gcov +CXXFILT = $(CROSS_COMPILE)c++filt +ELFEDIT = $(CROSS_COMPILE)elfedit +OBJCOPY = $(CROSS_COMPILE)objcopy +READELF = $(CROSS_COMPILE)readelf -CFLAGS_PIC = -fPIC +CFLAGS_PIC = -fPIC diff --git a/sysinfo/compiler/gcc.mk b/sysinfo/compiler/gcc.mk new file mode 100644 index 0000000..1705859 --- /dev/null +++ b/sysinfo/compiler/gcc.mk @@ -0,0 +1,43 @@ +ifeq ($(USER_CC)x,x) + ifeq ($(CROSS_COMPILE)x,x) + CC = $(CROSS_COMPILE)$(NATIVE_CC) + else + CC = $(CROSS_COMPILE)gcc + endif +else + CC = $(USER_CC) +endif + +ifeq ($(USER_CPP)x,x) + CPP = $(CROSS_COMPILE)cpp +else + CPP = $(USER_CPP) +endif + +ifeq ($(USER_CXX)x,x) + CXX = $(CROSS_COMPILE)c++ +else + CXX = $(USER_CXX) +endif + + +AS = $(CROSS_COMPILE)as +AR = $(CROSS_COMPILE)ar +LD = $(CROSS_COMPILE)ld +NM = $(CROSS_COMPILE)nm +OBJDUMP = $(CROSS_COMPILE)objdump +RANLIB = $(CROSS_COMPILE)ranlib +SIZE = $(CROSS_COMPILE)size +STRIP = $(CROSS_COMPILE)strip +STRINGS = $(CROSS_COMPILE)strings + + +ADDR2LINE = $(CROSS_COMPILE)addr2line +COV = $(CROSS_COMPILE)gcov +CXXFILT = $(CROSS_COMPILE)c++filt +ELFEDIT = $(CROSS_COMPILE)elfedit +OBJCOPY = $(CROSS_COMPILE)objcopy +READELF = $(CROSS_COMPILE)readelf + + +CFLAGS_PIC = -fPIC diff --git a/sysinfo/toolchain/clang.mk b/sysinfo/toolchain/clang.mk deleted file mode 100644 index 3e4a795..0000000 --- a/sysinfo/toolchain/clang.mk +++ /dev/null @@ -1,48 +0,0 @@ -ifeq ($(CROSS_COMPILE)x,x) - CROSS_HOST = - CROSS_HOST_SPEC = -else - CROSS_HOST = $(HOST) - CROSS_HOST_SPEC = --target=$(HOST) -endif - - -ifeq ($(USER_CC)x,x) - CC = $(NATIVE_CC) $(CROSS_HOST_SPEC) -else - CC = $(USER_CC) $(CROSS_HOST_SPEC) -endif - -ifeq ($(USER_CPP)x,x) - CPP = $(NATIVE_CC) $(CROSS_HOST_SPEC) -E -else - CPP = $(USER_CPP) $(CROSS_HOST_SPEC) -E -endif - -ifeq ($(USER_CXX)x,x) - CXX = $(NATIVE_CC)++ $(CROSS_HOST_SPEC) -else - CXX = $(USER_CXX) $(CROSS_HOST_SPEC) -endif - - -AS = $(CROSS_COMPILE)as -AR = $(CROSS_COMPILE)ar -LD = $(CROSS_COMPILE)ld -NM = $(CROSS_COMPILE)nm -OBJDUMP = $(CROSS_COMPILE)objdump -RANLIB = $(CROSS_COMPILE)ranlib -SIZE = $(CROSS_COMPILE)size -STRIP = $(CROSS_COMPILE)strip -STRINGS = $(CROSS_COMPILE)strings - - -ADDR2LINE = $(CROSS_COMPILE)addr2line -COV = $(CROSS_COMPILE)gcov -CXXFILT = $(CROSS_COMPILE)c++filt -ELFEDIT = $(CROSS_COMPILE)elfedit -OBJCOPY = $(CROSS_COMPILE)objcopy -READELF = $(CROSS_COMPILE)readelf - - -CFLAGS_PIC = -fPIC diff --git a/sysinfo/toolchain/gcc.mk b/sysinfo/toolchain/gcc.mk deleted file mode 100644 index 52a2545..0000000 --- a/sysinfo/toolchain/gcc.mk +++ /dev/null @@ -1,43 +0,0 @@ -ifeq ($(USER_CC)x,x) - ifeq ($(CROSS_COMPILE)x,x) - CC = $(CROSS_COMPILE)$(NATIVE_CC) - else - CC = $(CROSS_COMPILE)gcc - endif -else - CC = $(USER_CC) -endif - -ifeq ($(USER_CPP)x,x) - CPP = $(CROSS_COMPILE)cpp -else - CPP = $(USER_CPP) -endif - -ifeq ($(USER_CXX)x,x) - CXX = $(CROSS_COMPILE)c++ -else - CXX = $(USER_CXX) -endif - - -AS = $(CROSS_COMPILE)as -AR = $(CROSS_COMPILE)ar -LD = $(CROSS_COMPILE)ld -NM = $(CROSS_COMPILE)nm -OBJDUMP = $(CROSS_COMPILE)objdump -RANLIB = $(CROSS_COMPILE)ranlib -SIZE = $(CROSS_COMPILE)size -STRIP = $(CROSS_COMPILE)strip -STRINGS = $(CROSS_COMPILE)strings - - -ADDR2LINE = $(CROSS_COMPILE)addr2line -COV = $(CROSS_COMPILE)gcov -CXXFILT = $(CROSS_COMPILE)c++filt -ELFEDIT = $(CROSS_COMPILE)elfedit -OBJCOPY = $(CROSS_COMPILE)objcopy -READELF = $(CROSS_COMPILE)readelf - - -CFLAGS_PIC = -fPIC |