From f3fabc5d32d88b98a86fb8ed52f66f56138effe8 Mon Sep 17 00:00:00 2001 From: SPRESENSE <41312067+SPRESENSE@users.noreply.github.com> Date: Tue, 24 Oct 2023 08:50:15 +0900 Subject: [PATCH] Revert "make/archive: Use the full path name when matching or storing names in the archive" This reverts commit 563125fde3483b6dac97ee4a3ea4e93102f25b2d. --- arch/arm/src/cmake/Toolchain.cmake | 6 +++--- arch/arm/src/common/Toolchain.defs | 8 ++++---- arch/arm64/src/Toolchain.defs | 4 ++-- arch/avr/src/avr/Toolchain.defs | 2 +- arch/avr/src/avr32/Toolchain.defs | 2 +- arch/mips/src/mips32/Toolchain.defs | 2 +- arch/misoc/src/lm32/Toolchain.defs | 2 +- arch/misoc/src/minerva/Toolchain.defs | 2 +- arch/or1k/src/mor1kx/Toolchain.defs | 2 +- arch/risc-v/src/common/Toolchain.defs | 4 ++-- arch/sparc/src/sparc_v8/Toolchain.defs | 2 +- arch/xtensa/src/lx6/Toolchain.defs | 2 +- arch/xtensa/src/lx7/Toolchain.defs | 2 +- boards/renesas/m16c/skp16c26/scripts/Make.defs | 2 +- boards/renesas/rx65n/rx65n-grrose/scripts/Make.defs | 2 +- boards/renesas/rx65n/rx65n-rsk1mb/scripts/Make.defs | 2 +- boards/renesas/rx65n/rx65n-rsk2mb/scripts/Make.defs | 2 +- boards/renesas/rx65n/rx65n/scripts/Make.defs | 2 +- boards/renesas/sh1/us7032evb1/scripts/Make.defs | 2 +- boards/risc-v/mpfs/icicle/scripts/ld-envm-opensbi.script | 8 ++++---- boards/sim/sim/sim/scripts/Make.defs | 2 +- boards/x86/qemu/qemu-i486/scripts/Make.defs | 2 +- boards/x86_64/intel64/qemu-intel64/scripts/Make.defs | 2 +- 23 files changed, 33 insertions(+), 33 deletions(-) diff --git a/arch/arm/src/cmake/Toolchain.cmake b/arch/arm/src/cmake/Toolchain.cmake index a68bb56b87..3d3de23681 100644 --- a/arch/arm/src/cmake/Toolchain.cmake +++ b/arch/arm/src/cmake/Toolchain.cmake @@ -89,9 +89,9 @@ endif() # override the ARCHIVE command -set(CMAKE_C_ARCHIVE_CREATE " rcsP ") -set(CMAKE_CXX_ARCHIVE_CREATE " rcsP ") -set(CMAKE_ASM_ARCHIVE_CREATE " rcsP ") +set(CMAKE_C_ARCHIVE_CREATE " rcs ") +set(CMAKE_CXX_ARCHIVE_CREATE " rcs ") +set(CMAKE_ASM_ARCHIVE_CREATE " rcs ") # Architecture flags diff --git a/arch/arm/src/common/Toolchain.defs b/arch/arm/src/common/Toolchain.defs index 7c0e712d7b..e72d678f58 100644 --- a/arch/arm/src/common/Toolchain.defs +++ b/arch/arm/src/common/Toolchain.defs @@ -165,7 +165,7 @@ ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y) CPP = clang -E -P -x c LD = ld.lld -m armelf STRIP = llvm-strip --strip-unneeded - AR = llvm-ar rcsP + AR = llvm-ar rcs NM = llvm-nm OBJCOPY = llvm-objcopy OBJDUMP = llvm-objdump @@ -197,7 +197,7 @@ else ifeq ($(CONFIG_ARM_TOOLCHAIN_ARMCLANG),y) CPP = armclang -E -P -x c LD = armlink STRIP = llvm-strip --strip-unneeded - AR = armar -rcsP + AR = armar -rcs NM = llvm-nm OBJCOPY = llvm-objcopy OBJDUMP = llvm-objdump @@ -238,7 +238,7 @@ else CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded - AR = $(CROSSDEV)ar rcsP + AR = $(CROSSDEV)ar rcs NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump @@ -246,7 +246,7 @@ else ifeq ($(CONFIG_LTO_FULL),y) ifeq ($(CONFIG_ARM_TOOLCHAIN_GNU_EABI),y) LD := $(CROSSDEV)gcc - AR := $(CROSSDEV)gcc-ar rcsP + AR := $(CROSSDEV)gcc-ar rcs NM := $(CROSSDEV)gcc-nm ARCHOPTIMIZATION += -fno-builtin endif diff --git a/arch/arm64/src/Toolchain.defs b/arch/arm64/src/Toolchain.defs index 4b54399103..efebeb5651 100644 --- a/arch/arm64/src/Toolchain.defs +++ b/arch/arm64/src/Toolchain.defs @@ -146,7 +146,7 @@ STRIP = $(CROSSDEV)strip --strip-unneeded OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump LD = $(CROSSDEV)ld -AR = $(CROSSDEV)ar rcsP +AR = $(CROSSDEV)ar rcs NM = $(CROSSDEV)nm # Link Time Optimization @@ -155,7 +155,7 @@ ifeq ($(CONFIG_LTO_FULL),y) ARCHOPTIMIZATION += -flto ifeq ($(CONFIG_ARM_TOOLCHAIN_GNU_EABI),y) LD := $(CROSSDEV)gcc - AR := $(CROSSDEV)gcc-ar rcsP + AR := $(CROSSDEV)gcc-ar rcs NM := $(CROSSDEV)gcc-nm ARCHOPTIMIZATION += -fuse-linker-plugin ARCHOPTIMIZATION += -fno-builtin diff --git a/arch/avr/src/avr/Toolchain.defs b/arch/avr/src/avr/Toolchain.defs index b183f89c9a..ea98f72bcb 100644 --- a/arch/avr/src/avr/Toolchain.defs +++ b/arch/avr/src/avr/Toolchain.defs @@ -147,7 +147,7 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)ar rcsP +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 ad772b8826..8c9d19510c 100644 --- a/arch/avr/src/avr32/Toolchain.defs +++ b/arch/avr/src/avr32/Toolchain.defs @@ -77,7 +77,7 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)ar rcsP +AR = $(CROSSDEV)ar rcs NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump diff --git a/arch/mips/src/mips32/Toolchain.defs b/arch/mips/src/mips32/Toolchain.defs index fa5b6b4d51..9f852c354a 100644 --- a/arch/mips/src/mips32/Toolchain.defs +++ b/arch/mips/src/mips32/Toolchain.defs @@ -286,7 +286,7 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)ar rcsP +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 78025085c8..bde979f005 100644 --- a/arch/misoc/src/lm32/Toolchain.defs +++ b/arch/misoc/src/lm32/Toolchain.defs @@ -108,7 +108,7 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)ar rcsP +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 22c889b533..2848a97968 100644 --- a/arch/misoc/src/minerva/Toolchain.defs +++ b/arch/misoc/src/minerva/Toolchain.defs @@ -56,7 +56,7 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)ar rcsP +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 314d550f7e..e048f11583 100644 --- a/arch/or1k/src/mor1kx/Toolchain.defs +++ b/arch/or1k/src/mor1kx/Toolchain.defs @@ -94,7 +94,7 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)ar rcsP +AR = $(CROSSDEV)ar rcs NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump diff --git a/arch/risc-v/src/common/Toolchain.defs b/arch/risc-v/src/common/Toolchain.defs index 5ee58d949f..61d7f270c3 100644 --- a/arch/risc-v/src/common/Toolchain.defs +++ b/arch/risc-v/src/common/Toolchain.defs @@ -260,7 +260,7 @@ STRIP = $(CROSSDEV)strip --strip-unneeded OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump LD = $(CROSSDEV)ld -AR = $(CROSSDEV)ar rcsP +AR = $(CROSSDEV)ar rcs NM = $(CROSSDEV)nm # Link Time Optimization @@ -269,7 +269,7 @@ ifeq ($(CONFIG_LTO_FULL),y) ARCHOPTIMIZATION += -flto ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RVG) LD := $(CROSSDEV)gcc - AR := $(CROSSDEV)gcc-ar rcsP + AR := $(CROSSDEV)gcc-ar rcs NM := $(CROSSDEV)gcc-nm ARCHOPTIMIZATION += -fuse-linker-plugin ARCHOPTIMIZATION += -fno-builtin diff --git a/arch/sparc/src/sparc_v8/Toolchain.defs b/arch/sparc/src/sparc_v8/Toolchain.defs index 76799694f5..b6c199e8d0 100644 --- a/arch/sparc/src/sparc_v8/Toolchain.defs +++ b/arch/sparc/src/sparc_v8/Toolchain.defs @@ -115,7 +115,7 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)ar rcsP +AR = $(CROSSDEV)ar rcs NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump diff --git a/arch/xtensa/src/lx6/Toolchain.defs b/arch/xtensa/src/lx6/Toolchain.defs index c68770234f..1be4627c92 100644 --- a/arch/xtensa/src/lx6/Toolchain.defs +++ b/arch/xtensa/src/lx6/Toolchain.defs @@ -160,7 +160,7 @@ endif LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)ar rcsP +AR = $(CROSSDEV)ar rcs NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump diff --git a/arch/xtensa/src/lx7/Toolchain.defs b/arch/xtensa/src/lx7/Toolchain.defs index a7f0ee98da..710b19677d 100644 --- a/arch/xtensa/src/lx7/Toolchain.defs +++ b/arch/xtensa/src/lx7/Toolchain.defs @@ -164,7 +164,7 @@ endif LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)ar rcsP +AR = $(CROSSDEV)ar rcs NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump diff --git a/boards/renesas/m16c/skp16c26/scripts/Make.defs b/boards/renesas/m16c/skp16c26/scripts/Make.defs index c7988123b6..d20c9f3087 100644 --- a/boards/renesas/m16c/skp16c26/scripts/Make.defs +++ b/boards/renesas/m16c/skp16c26/scripts/Make.defs @@ -25,7 +25,7 @@ CROSSDEV = m32c-nuttx-elf- CC = $(CROSSDEV)gcc CPP = $(CROSSDEV)gcc -E LD = $(CROSSDEV)ld -AR = $(CROSSDEV)ar rcsP +AR = $(CROSSDEV)ar rcs NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump diff --git a/boards/renesas/rx65n/rx65n-grrose/scripts/Make.defs b/boards/renesas/rx65n/rx65n-grrose/scripts/Make.defs index 7a0acf7101..98e54d69ef 100644 --- a/boards/renesas/rx65n/rx65n-grrose/scripts/Make.defs +++ b/boards/renesas/rx65n/rx65n-grrose/scripts/Make.defs @@ -29,7 +29,7 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)ar rcsP +AR = $(CROSSDEV)ar rcs AS = $(CROSSDEV)as NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy diff --git a/boards/renesas/rx65n/rx65n-rsk1mb/scripts/Make.defs b/boards/renesas/rx65n/rx65n-rsk1mb/scripts/Make.defs index d25013cf71..3d7b889571 100644 --- a/boards/renesas/rx65n/rx65n-rsk1mb/scripts/Make.defs +++ b/boards/renesas/rx65n/rx65n-rsk1mb/scripts/Make.defs @@ -29,7 +29,7 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)ar rcsP +AR = $(CROSSDEV)ar rcs AS = $(CROSSDEV)as NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/scripts/Make.defs b/boards/renesas/rx65n/rx65n-rsk2mb/scripts/Make.defs index a407fdedef..f55a3606f0 100644 --- a/boards/renesas/rx65n/rx65n-rsk2mb/scripts/Make.defs +++ b/boards/renesas/rx65n/rx65n-rsk2mb/scripts/Make.defs @@ -29,7 +29,7 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)ar rcsP +AR = $(CROSSDEV)ar rcs AS = $(CROSSDEV)as NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy diff --git a/boards/renesas/rx65n/rx65n/scripts/Make.defs b/boards/renesas/rx65n/rx65n/scripts/Make.defs index 9647404cb5..dd8502d6d4 100644 --- a/boards/renesas/rx65n/rx65n/scripts/Make.defs +++ b/boards/renesas/rx65n/rx65n/scripts/Make.defs @@ -29,7 +29,7 @@ CXX = $(CROSSDEV)g++ CPP = $(CROSSDEV)gcc -E -P -x c LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)ar rcsP +AR = $(CROSSDEV)ar rcs AS = $(CROSSDEV)as NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy diff --git a/boards/renesas/sh1/us7032evb1/scripts/Make.defs b/boards/renesas/sh1/us7032evb1/scripts/Make.defs index 5a0114cf90..be01eab4c2 100644 --- a/boards/renesas/sh1/us7032evb1/scripts/Make.defs +++ b/boards/renesas/sh1/us7032evb1/scripts/Make.defs @@ -39,7 +39,7 @@ CC = $(CROSSDEV)gcc CPP = $(CROSSDEV)gcc -E LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)ar rcsP +AR = $(CROSSDEV)ar rcs NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump diff --git a/boards/risc-v/mpfs/icicle/scripts/ld-envm-opensbi.script b/boards/risc-v/mpfs/icicle/scripts/ld-envm-opensbi.script index 71f988ff3a..7a7a3710bc 100644 --- a/boards/risc-v/mpfs/icicle/scripts/ld-envm-opensbi.script +++ b/boards/risc-v/mpfs/icicle/scripts/ld-envm-opensbi.script @@ -36,10 +36,10 @@ SECTIONS PROVIDE(__l2lim_end = ORIGIN(l2lim) + LENGTH(l2lim)); .text.sbi : { - */sbi* - */riscv_atomic* - */riscv_locks* - */riscv_asm* + sbi* + riscv_atomic* + riscv_locks* + riscv_asm* } > ddr .l2_scratchpad : ALIGN(0x10) diff --git a/boards/sim/sim/sim/scripts/Make.defs b/boards/sim/sim/sim/scripts/Make.defs index 9ad0d93d97..6c9a77b0ce 100644 --- a/boards/sim/sim/sim/scripts/Make.defs +++ b/boards/sim/sim/sim/scripts/Make.defs @@ -166,7 +166,7 @@ STRIP = $(CROSSDEV)strip AR = $(TOPDIR)/tools/macar-qcs.sh else STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)ar rcsP +AR = $(CROSSDEV)ar rcs endif NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy diff --git a/boards/x86/qemu/qemu-i486/scripts/Make.defs b/boards/x86/qemu/qemu-i486/scripts/Make.defs index e361392a78..a8b5c7cdef 100644 --- a/boards/x86/qemu/qemu-i486/scripts/Make.defs +++ b/boards/x86/qemu/qemu-i486/scripts/Make.defs @@ -53,7 +53,7 @@ CC = $(CROSSDEV)gcc CPP = $(CROSSDEV)gcc -E LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)ar rcsP +AR = $(CROSSDEV)ar rcs NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump diff --git a/boards/x86_64/intel64/qemu-intel64/scripts/Make.defs b/boards/x86_64/intel64/qemu-intel64/scripts/Make.defs index 9dceb97084..f9a264dfbb 100644 --- a/boards/x86_64/intel64/qemu-intel64/scripts/Make.defs +++ b/boards/x86_64/intel64/qemu-intel64/scripts/Make.defs @@ -51,7 +51,7 @@ CC = $(CROSSDEV)gcc CPP = $(CROSSDEV)gcc -E LD = $(CROSSDEV)ld STRIP = $(CROSSDEV)strip --strip-unneeded -AR = $(CROSSDEV)ar rcsP +AR = $(CROSSDEV)ar rcs NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump