sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "arch: Replace ar and nm with gcc-ar and gcc-nm"

Browse Source 
This reverts commit b05737d78fb0e746f46a19f2cdd9d4dc59e54985.

Because it broke clang-based builds.
This commit is contained in:
YAMAMOTO Takashi 2021-09-06 08:47:27 +09:00 committed by Xiang Xiao
parent eb48a0dbe0
commit 5ad1cba338
15 changed files with 54 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/src/arm/Toolchain.defs
View File

@ -90,8 +90,8 @@ CXX = $(CROSSDEV)g++
CPP = $(CROSSDEV)gcc -E -P -x c CPP = $(CROSSDEV)gcc -E -P -x c
LD = $(CROSSDEV)gcc LD = $(CROSSDEV)gcc
STRIP = $(CROSSDEV)strip --strip-unneeded STRIP = $(CROSSDEV)strip --strip-unneeded
AR = $(CROSSDEV)gcc-ar rcs AR = $(CROSSDEV)ar rcs
NM = $(CROSSDEV)gcc-nm NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump OBJDUMP = $(CROSSDEV)objdump

4
arch/arm/src/armv6-m/Toolchain.defs
View File

@ -82,8 +82,8 @@ CXX = $(CROSSDEV)g++
CPP = $(CROSSDEV)gcc -E -P -x c CPP = $(CROSSDEV)gcc -E -P -x c
LD = $(CROSSDEV)gcc LD = $(CROSSDEV)gcc
STRIP = $(CROSSDEV)strip --strip-unneeded STRIP = $(CROSSDEV)strip --strip-unneeded
AR = $(CROSSDEV)gcc-ar rcs AR = $(CROSSDEV)ar rcs
NM = $(CROSSDEV)gcc-nm NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump OBJDUMP = $(CROSSDEV)objdump

4
arch/arm/src/armv7-a/Toolchain.defs
View File

@ -108,8 +108,8 @@ CXX = $(CROSSDEV)g++
CPP = $(CROSSDEV)gcc -E -P -x c CPP = $(CROSSDEV)gcc -E -P -x c
LD = $(CROSSDEV)gcc LD = $(CROSSDEV)gcc
STRIP = $(CROSSDEV)strip --strip-unneeded STRIP = $(CROSSDEV)strip --strip-unneeded
AR = $(CROSSDEV)gcc-ar rcs AR = $(CROSSDEV)ar rcs
NM = $(CROSSDEV)gcc-nm NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump OBJDUMP = $(CROSSDEV)objdump

4
arch/arm/src/armv7-m/Toolchain.defs
View File

@ -144,8 +144,8 @@ endif
LD = $(CROSSDEV)gcc LD = $(CROSSDEV)gcc
STRIP = $(CROSSDEV)strip --strip-unneeded STRIP = $(CROSSDEV)strip --strip-unneeded
AR = $(CROSSDEV)gcc-ar rcs AR = $(CROSSDEV)ar rcs
NM = $(CROSSDEV)gcc-nm NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump OBJDUMP = $(CROSSDEV)objdump

4
arch/arm/src/armv7-r/Toolchain.defs
View File

@ -90,8 +90,8 @@ CXX = $(CROSSDEV)g++
CPP = $(CROSSDEV)gcc -E -P -x c CPP = $(CROSSDEV)gcc -E -P -x c
LD = $(CROSSDEV)gcc LD = $(CROSSDEV)gcc
STRIP = $(CROSSDEV)strip --strip-unneeded STRIP = $(CROSSDEV)strip --strip-unneeded
AR = $(CROSSDEV)gcc-ar rcs AR = $(CROSSDEV)ar rcs
NM = $(CROSSDEV)gcc-nm NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump OBJDUMP = $(CROSSDEV)objdump

4
arch/arm/src/armv8-m/Toolchain.defs
View File

@ -132,8 +132,8 @@ CXX = $(CROSSDEV)g++
CPP = $(CROSSDEV)gcc -E -P -x c CPP = $(CROSSDEV)gcc -E -P -x c
LD = $(CROSSDEV)gcc LD = $(CROSSDEV)gcc
STRIP = $(CROSSDEV)strip --strip-unneeded STRIP = $(CROSSDEV)strip --strip-unneeded
AR = $(CROSSDEV)gcc-ar rcs AR = $(CROSSDEV)ar rcs
NM = $(CROSSDEV)gcc-nm NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump OBJDUMP = $(CROSSDEV)objdump

4
arch/avr/src/avr/Toolchain.defs
View File

@ -123,8 +123,8 @@ CXX = $(CROSSDEV)g++
CPP = $(CROSSDEV)gcc -E -P -x c CPP = $(CROSSDEV)gcc -E -P -x c
LD = $(CROSSDEV)gcc LD = $(CROSSDEV)gcc
STRIP = $(CROSSDEV)strip --strip-unneeded STRIP = $(CROSSDEV)strip --strip-unneeded
AR = $(CROSSDEV)gcc-ar rcs AR = $(CROSSDEV)ar rcs
NM = $(CROSSDEV)gcc-nm NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump OBJDUMP = $(CROSSDEV)objdump

4
arch/avr/src/avr32/Toolchain.defs
View File

@ -43,8 +43,8 @@ CXX = $(CROSSDEV)g++
CPP = $(CROSSDEV)gcc -E -P -x c CPP = $(CROSSDEV)gcc -E -P -x c
LD = $(CROSSDEV)gcc LD = $(CROSSDEV)gcc
STRIP = $(CROSSDEV)strip --strip-unneeded STRIP = $(CROSSDEV)strip --strip-unneeded
AR = $(CROSSDEV)gcc-ar rcs AR = $(CROSSDEV)ar rcs
NM = $(CROSSDEV)gcc-nm NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump OBJDUMP = $(CROSSDEV)objdump

4
arch/misoc/src/lm32/Toolchain.defs
View File

@ -80,8 +80,8 @@ CXX = $(CROSSDEV)g++
CPP = $(CROSSDEV)gcc -E -P -x c CPP = $(CROSSDEV)gcc -E -P -x c
LD = $(CROSSDEV)gcc LD = $(CROSSDEV)gcc
STRIP = $(CROSSDEV)strip --strip-unneeded STRIP = $(CROSSDEV)strip --strip-unneeded
AR = $(CROSSDEV)gcc-ar rcs AR = $(CROSSDEV)ar rcs
NM = $(CROSSDEV)gcc-nm NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump OBJDUMP = $(CROSSDEV)objdump

4
arch/misoc/src/minerva/Toolchain.defs
View File

@ -34,8 +34,8 @@ CXX = $(CROSSDEV)g++
CPP = $(CROSSDEV)gcc -E -P -x c CPP = $(CROSSDEV)gcc -E -P -x c
LD = $(CROSSDEV)gcc LD = $(CROSSDEV)gcc
STRIP = $(CROSSDEV)strip --strip-unneeded STRIP = $(CROSSDEV)strip --strip-unneeded
AR = $(CROSSDEV)gcc-ar rcs AR = $(CROSSDEV)ar rcs
NM = $(CROSSDEV)gcc-nm NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump OBJDUMP = $(CROSSDEV)objdump

4
arch/or1k/src/mor1kx/Toolchain.defs
View File

@ -61,8 +61,8 @@ CXX = $(CROSSDEV)g++
CPP = $(CROSSDEV)gcc -E -P -x c CPP = $(CROSSDEV)gcc -E -P -x c
LD = $(CROSSDEV)gcc LD = $(CROSSDEV)gcc
STRIP = $(CROSSDEV)strip --strip-unneeded STRIP = $(CROSSDEV)strip --strip-unneeded
AR = $(CROSSDEV)gcc-ar rcs AR = $(CROSSDEV)ar rcs
NM = $(CROSSDEV)gcc-nm NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump OBJDUMP = $(CROSSDEV)objdump

10
boards/arm/imxrt/teensy-4.x/scripts/Make.defs
View File

@ -34,6 +34,16 @@ else
ARCHSCRIPT = -T$(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT) ARCHSCRIPT = -T$(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)
endif endif
CC = $(CROSSDEV)gcc
CXX = $(CROSSDEV)g++
CPP = $(CROSSDEV)gcc -E
LD = $(CROSSDEV)gcc
STRIP = $(CROSSDEV)strip --strip-unneeded
AR = $(CROSSDEV)ar rcs
NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump
ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'} ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1} ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}

10
boards/arm/nrf52/nrf52832-mdk/scripts/Make.defs
View File

@ -30,6 +30,16 @@ else
ARCHSCRIPT = -T$(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT) ARCHSCRIPT = -T$(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)
endif endif
CC = $(CROSSDEV)gcc
CXX = $(CROSSDEV)g++
CPP = $(CROSSDEV)gcc -E
LD = $(CROSSDEV)gcc
STRIP = $(CROSSDEV)strip --strip-unneeded
AR = $(CROSSDEV)ar rcs
NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump
ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'} ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1} ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}

10
boards/arm/nrf52/nrf52832-sparkfun/scripts/Make.defs
View File

@ -30,6 +30,16 @@ else
ARCHSCRIPT = -T$(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT) ARCHSCRIPT = -T$(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)
endif endif
CC = $(CROSSDEV)gcc
CXX = $(CROSSDEV)g++
CPP = $(CROSSDEV)gcc -E
LD = $(CROSSDEV)gcc
STRIP = $(CROSSDEV)strip --strip-unneeded
AR = $(CROSSDEV)ar rcs
NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump
ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'} ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1} ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}

5
boards/sim/sim/sim/scripts/Make.defs
View File

@ -87,12 +87,11 @@ LD = $(CROSSDEV)cc
ifeq ($(CONFIG_HOST_MACOS),y) ifeq ($(CONFIG_HOST_MACOS),y)
STRIP = $(CROSSDEV)strip STRIP = $(CROSSDEV)strip
AR = $(TOPDIR)/tools/macar-rcs.sh AR = $(TOPDIR)/tools/macar-rcs.sh
NM = $(CROSSDEV)nm
else else
STRIP = $(CROSSDEV)strip --strip-unneeded STRIP = $(CROSSDEV)strip --strip-unneeded
AR = $(CROSSDEV)gcc-ar rcs AR = $(CROSSDEV)ar rcs
NM = $(CROSSDEV)gcc-nm
endif endif
NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump OBJDUMP = $(CROSSDEV)objdump