From a88aa01dd80ad45d288fc992de33d61f696e4faa Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Mon, 6 Sep 2021 08:47:27 +0900 Subject: [PATCH] Revert "arch: Replace ar and nm with gcc-ar and gcc-nm" This reverts commit b05737d78fb0e746f46a19f2cdd9d4dc59e54985. Because it broke clang-based builds. Change-Id: Icc97d325adacfc58198b082538f3db2d02ba9a90 --- arch/arm/src/arm/Toolchain.defs | 4 ++-- arch/arm/src/armv6-m/Toolchain.defs | 4 ++-- arch/arm/src/armv7-a/Toolchain.defs | 4 ++-- arch/arm/src/armv7-m/Toolchain.defs | 4 ++-- arch/arm/src/armv7-r/Toolchain.defs | 4 ++-- arch/arm/src/armv8-m/Toolchain.defs | 4 ++-- arch/avr/src/avr/Toolchain.defs | 4 ++-- arch/avr/src/avr32/Toolchain.defs | 4 ++-- arch/misoc/src/lm32/Toolchain.defs | 4 ++-- arch/misoc/src/minerva/Toolchain.defs | 4 ++-- arch/or1k/src/mor1kx/Toolchain.defs | 4 ++-- boards/sim/sim/sim/scripts/Make.defs | 5 ++--- 12 files changed, 24 insertions(+), 25 deletions(-) diff --git a/arch/arm/src/arm/Toolchain.defs b/arch/arm/src/arm/Toolchain.defs index 53355dc8a22..4d2bf17ef5d 100644 --- a/arch/arm/src/arm/Toolchain.defs +++ b/arch/arm/src/arm/Toolchain.defs @@ -90,8 +90,8 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)gcc-ar rcs -NM = $(CROSSDEV)gcc-nm +AR = $(CROSSDEV)ar rcs +NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump diff --git a/arch/arm/src/armv6-m/Toolchain.defs b/arch/arm/src/armv6-m/Toolchain.defs index c83a63ac0b1..4880564271a 100644 --- a/arch/arm/src/armv6-m/Toolchain.defs +++ b/arch/arm/src/armv6-m/Toolchain.defs @@ -82,8 +82,8 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)gcc-ar rcs -NM = $(CROSSDEV)gcc-nm +AR = $(CROSSDEV)ar rcs +NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump diff --git a/arch/arm/src/armv7-a/Toolchain.defs b/arch/arm/src/armv7-a/Toolchain.defs index 0a0cf6c2a7c..ced1d0d10b5 100644 --- a/arch/arm/src/armv7-a/Toolchain.defs +++ b/arch/arm/src/armv7-a/Toolchain.defs @@ -108,8 +108,8 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)gcc-ar rcs -NM = $(CROSSDEV)gcc-nm +AR = $(CROSSDEV)ar rcs +NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump diff --git a/arch/arm/src/armv7-m/Toolchain.defs b/arch/arm/src/armv7-m/Toolchain.defs index b99ff3b66e7..9dd1bde2af2 100644 --- a/arch/arm/src/armv7-m/Toolchain.defs +++ b/arch/arm/src/armv7-m/Toolchain.defs @@ -138,8 +138,8 @@ endif LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)gcc-ar rcs -NM = $(CROSSDEV)gcc-nm +AR = $(CROSSDEV)ar rcs +NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump diff --git a/arch/arm/src/armv7-r/Toolchain.defs b/arch/arm/src/armv7-r/Toolchain.defs index 4bbc2651bb7..4af6d187faa 100644 --- a/arch/arm/src/armv7-r/Toolchain.defs +++ b/arch/arm/src/armv7-r/Toolchain.defs @@ -90,8 +90,8 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)gcc-ar rcs -NM = $(CROSSDEV)gcc-nm +AR = $(CROSSDEV)ar rcs +NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump diff --git a/arch/arm/src/armv8-m/Toolchain.defs b/arch/arm/src/armv8-m/Toolchain.defs index ef7c227ba93..3ffcfda9d9a 100644 --- a/arch/arm/src/armv8-m/Toolchain.defs +++ b/arch/arm/src/armv8-m/Toolchain.defs @@ -136,8 +136,8 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)gcc-ar rcs -NM = $(CROSSDEV)gcc-nm +AR = $(CROSSDEV)ar rcs +NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump diff --git a/arch/avr/src/avr/Toolchain.defs b/arch/avr/src/avr/Toolchain.defs index d1b62de149a..7a2dadd5317 100644 --- a/arch/avr/src/avr/Toolchain.defs +++ b/arch/avr/src/avr/Toolchain.defs @@ -119,8 +119,8 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)gcc-ar rcs -NM = $(CROSSDEV)gcc-nm +AR = $(CROSSDEV)ar rcs +NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump diff --git a/arch/avr/src/avr32/Toolchain.defs b/arch/avr/src/avr32/Toolchain.defs index f3ce5bf7698..73826ec043e 100644 --- a/arch/avr/src/avr32/Toolchain.defs +++ b/arch/avr/src/avr32/Toolchain.defs @@ -43,8 +43,8 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)gcc-ar rcs -NM = $(CROSSDEV)gcc-nm +AR = $(CROSSDEV)ar rcs +NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump diff --git a/arch/misoc/src/lm32/Toolchain.defs b/arch/misoc/src/lm32/Toolchain.defs index a2352d6b4c2..191540d294d 100644 --- a/arch/misoc/src/lm32/Toolchain.defs +++ b/arch/misoc/src/lm32/Toolchain.defs @@ -80,8 +80,8 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)gcc-ar rcs -NM = $(CROSSDEV)gcc-nm +AR = $(CROSSDEV)ar rcs +NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump diff --git a/arch/misoc/src/minerva/Toolchain.defs b/arch/misoc/src/minerva/Toolchain.defs index 4da093e9211..2ca9fe4656c 100644 --- a/arch/misoc/src/minerva/Toolchain.defs +++ b/arch/misoc/src/minerva/Toolchain.defs @@ -34,8 +34,8 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)gcc-ar rcs -NM = $(CROSSDEV)gcc-nm +AR = $(CROSSDEV)ar rcs +NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump diff --git a/arch/or1k/src/mor1kx/Toolchain.defs b/arch/or1k/src/mor1kx/Toolchain.defs index 6961548d329..0dd120a7fc5 100644 --- a/arch/or1k/src/mor1kx/Toolchain.defs +++ b/arch/or1k/src/mor1kx/Toolchain.defs @@ -61,8 +61,8 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)gcc-ar rcs -NM = $(CROSSDEV)gcc-nm +AR = $(CROSSDEV)ar rcs +NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump diff --git a/boards/sim/sim/sim/scripts/Make.defs b/boards/sim/sim/sim/scripts/Make.defs index b62e60f1dd3..655bfe34638 100644 --- a/boards/sim/sim/sim/scripts/Make.defs +++ b/boards/sim/sim/sim/scripts/Make.defs @@ -91,12 +91,11 @@ LD = $(CROSSDEV)ld ifeq ($(CONFIG_HOST_MACOS),y) STRIP = $(CROSSDEV)strip AR = $(TOPDIR)/tools/macar-rcs.sh -NM = $(CROSSDEV)nm else STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)gcc-ar rcs -NM = $(CROSSDEV)gcc-nm +AR = $(CROSSDEV)ar rcs endif +NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump