Skip to content

Commit fe52530

Browse files
zdebanoszdebanos
committed
Make/Toolchain.defs: add the AR_EXTRACT command
Use this command to extract archives. Not all architectures are modified, only those commands I know or could be logically deducted from the rest were added. Signed-off-by: Stepan Pressl <pressl.stepan@gmail.com>
1 parent 7ea3f8e commit fe52530

File tree

24 files changed

+91
-63
lines changed

24 files changed

+91
-63
lines changed

‎arch/arm/src/common/Toolchain.defs‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -208,15 +208,16 @@ endif
208208

209209
ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y)
210210

211-
CC = clang
212-
CXX = clang++
213-
CPP = clang -E -P -x c
214-
LD = ld.lld -m armelf
215-
STRIP = llvm-strip --strip-unneeded
216-
AR = llvm-ar rcs
217-
NM = llvm-nm
218-
OBJCOPY = llvm-objcopy
219-
OBJDUMP = llvm-objdump
211+
CC = clang
212+
CXX = clang++
213+
CPP = clang -E -P -x c
214+
LD = ld.lld -m armelf
215+
STRIP = llvm-strip --strip-unneeded
216+
AR = llvm-ar rcs
217+
AR_EXTRACT = llvm-ar x
218+
NM = llvm-nm
219+
OBJCOPY = llvm-objcopy
220+
OBJDUMP = llvm-objdump
220221

221222
# Since the no_builtin attribute is not fully supported on Clang
222223
# disable the built-in functions, refer:
@@ -251,15 +252,16 @@ ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y)
251252

252253
else ifeq ($(CONFIG_ARM_TOOLCHAIN_ARMCLANG),y)
253254

254-
CC = armclang
255-
CXX = armclang
256-
CPP = armclang -E -P -x c
257-
LD = armlink
258-
STRIP = llvm-strip --strip-unneeded
259-
AR = armar -rcs
260-
NM = llvm-nm
261-
OBJCOPY = llvm-objcopy
262-
OBJDUMP = llvm-objdump
255+
CC = armclang
256+
CXX = armclang
257+
CPP = armclang -E -P -x c
258+
LD = armlink
259+
STRIP = llvm-strip --strip-unneeded
260+
AR = armar -rcs
261+
AR_EXTRACT = armar -x
262+
NM = llvm-nm
263+
OBJCOPY = llvm-objcopy
264+
OBJDUMP = llvm-objdump
263265

264266
# Since the no_builtin attribute is not fully supported on Clang
265267
# disable the built-in functions, refer:
@@ -308,15 +310,16 @@ else ifeq ($(CONFIG_ARM_TOOLCHAIN_GHS),y)
308310
# Default toolchain
309311

310312
else
311-
CC = $(CROSSDEV)gcc
312-
CXX = $(CROSSDEV)g++
313-
CPP = $(CROSSDEV)gcc -E -P -x c
314-
LD = $(CROSSDEV)ld
315-
STRIP = $(CROSSDEV)strip --strip-unneeded
316-
AR = $(CROSSDEV)ar rcs
317-
NM = $(CROSSDEV)nm
318-
OBJCOPY = $(CROSSDEV)objcopy
319-
OBJDUMP = $(CROSSDEV)objdump
313+
CC = $(CROSSDEV)gcc
314+
CXX = $(CROSSDEV)g++
315+
CPP = $(CROSSDEV)gcc -E -P -x c
316+
LD = $(CROSSDEV)ld
317+
STRIP = $(CROSSDEV)strip --strip-unneeded
318+
AR = $(CROSSDEV)ar rcs
319+
AR_EXTRACT = $(CROSSDEV)ar x
320+
NM = $(CROSSDEV)nm
321+
OBJCOPY = $(CROSSDEV)objcopy
322+
OBJDUMP = $(CROSSDEV)objdump
320323

321324
ifeq ($(CONFIG_LTO_FULL),y)
322325
ifeq ($(CONFIG_ARM_TOOLCHAIN_GNU_EABI),y)

‎arch/arm64/src/Toolchain.defs‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -225,17 +225,19 @@ ifeq ($(CONFIG_ARCH_TOOLCHAIN_GCC),y)
225225
OBJDUMP = $(CROSSDEV)objdump
226226
LD = $(CROSSDEV)ld
227227
AR = $(CROSSDEV)ar rcs
228+
AR_EXTRACT = $(CROSSDEV)ar x
228229
NM = $(CROSSDEV)nm
229230
else ifeq ($(CONFIG_ARCH_TOOLCHAIN_CLANG),y)
230-
CC = clang
231-
CXX = clang++
232-
CPP = clang -E -P -x c
233-
LD = ld.lld -m aarch64elf
234-
STRIP = llvm-strip --strip-unneeded
235-
AR = llvm-ar rcs
236-
NM = llvm-nm
237-
OBJCOPY = llvm-objcopy
238-
OBJDUMP = llvm-objdump
231+
CC = clang
232+
CXX = clang++
233+
CPP = clang -E -P -x c
234+
LD = ld.lld -m aarch64elf
235+
STRIP = llvm-strip --strip-unneeded
236+
AR = llvm-ar rcs
237+
AR_EXTRACT = llvm-ar x
238+
NM = llvm-nm
239+
OBJCOPY = llvm-objcopy
240+
OBJDUMP = llvm-objdump
239241
endif
240242

241243
# Link Time Optimization

‎arch/avr/src/avr/Toolchain.defs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ CPP = $(CROSSDEV)gcc -E -P -x c
188188
LD = $(CROSSDEV)ld
189189
STRIP = $(CROSSDEV)strip --strip-unneeded
190190
AR = $(CROSSDEV)ar rcs
191+
AR_EXTRACT = $(CROSSDEV)ar x
191192
NM = $(CROSSDEV)nm
192193
OBJCOPY = $(CROSSDEV)objcopy
193194
OBJDUMP = $(CROSSDEV)objdump

‎arch/avr/src/avr32/Toolchain.defs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ CPP = $(CROSSDEV)gcc -E -P -x c
8484
LD = $(CROSSDEV)ld
8585
STRIP = $(CROSSDEV)strip --strip-unneeded
8686
AR = $(CROSSDEV)ar rcs
87+
AR = $(CROSSDEV)ar x
8788
NM = $(CROSSDEV)nm
8889
OBJCOPY = $(CROSSDEV)objcopy
8990
OBJDUMP = $(CROSSDEV)objdump

‎arch/mips/src/mips32/Toolchain.defs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ CPP = $(CROSSDEV)gcc -E -P -x c
299299
LD = $(CROSSDEV)ld
300300
STRIP = $(CROSSDEV)strip --strip-unneeded
301301
AR = $(CROSSDEV)ar rcs
302+
AR_EXTRACT = $(CROSSDEV)ar x
302303
NM = $(CROSSDEV)nm
303304
OBJCOPY = $(CROSSDEV)objcopy
304305
OBJDUMP = $(CROSSDEV)objdump

‎arch/misoc/src/lm32/Toolchain.defs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ CPP = $(CROSSDEV)gcc -E -P -x c
115115
LD = $(CROSSDEV)ld
116116
STRIP = $(CROSSDEV)strip --strip-unneeded
117117
AR = $(CROSSDEV)ar rcs
118+
AR_EXTRACT = $(CROSSDEV)ar x
118119
NM = $(CROSSDEV)nm
119120
OBJCOPY = $(CROSSDEV)objcopy
120121
OBJDUMP = $(CROSSDEV)objdump

‎arch/misoc/src/minerva/Toolchain.defs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ CPP = $(CROSSDEV)gcc -E -P -x c
5959
LD = $(CROSSDEV)ld
6060
STRIP = $(CROSSDEV)strip --strip-unneeded
6161
AR = $(CROSSDEV)ar rcs
62+
AR_EXTRACT = $(CROSSDEV)ar x
6263
NM = $(CROSSDEV)nm
6364
OBJCOPY = $(CROSSDEV)objcopy
6465
OBJDUMP = $(CROSSDEV)objdump

‎arch/or1k/src/mor1kx/Toolchain.defs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ CPP = $(CROSSDEV)gcc -E -P -x c
101101
LD = $(CROSSDEV)ld
102102
STRIP = $(CROSSDEV)strip --strip-unneeded
103103
AR = $(CROSSDEV)ar rcs
104+
AR_EXTRACT = $(CROSSDEV)ar x
104105
NM = $(CROSSDEV)nm
105106
OBJCOPY = $(CROSSDEV)objcopy
106107
OBJDUMP = $(CROSSDEV)objdump

‎arch/risc-v/src/common/Toolchain.defs‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -347,15 +347,16 @@ endif
347347

348348
ifeq ($(CONFIG_ARCH_TOOLCHAIN_CLANG),y)
349349

350-
CC = $(CROSSDEV)clang
351-
CXX = $(CROSSDEV)clang++
352-
CPP = $(CROSSDEV)clang -E -P -x c
353-
LD = $(CROSSDEV)clang
354-
STRIP = $(CROSSDEV)llvm-strip --strip-unneeded
355-
AR = $(CROSSDEV)llvm-ar rcs
356-
NM = $(CROSSDEV)llvm-nm
357-
OBJCOPY = $(CROSSDEV)llvm-objcopy
358-
OBJDUMP = $(CROSSDEV)llvm-objdump
350+
CC = $(CROSSDEV)clang
351+
CXX = $(CROSSDEV)clang++
352+
CPP = $(CROSSDEV)clang -E -P -x c
353+
LD = $(CROSSDEV)clang
354+
STRIP = $(CROSSDEV)llvm-strip --strip-unneeded
355+
AR = $(CROSSDEV)llvm-ar rcs
356+
AR_EXTRACT = $(CROSSDEV)llvm-ar x
357+
NM = $(CROSSDEV)llvm-nm
358+
OBJCOPY = $(CROSSDEV)llvm-objcopy
359+
OBJDUMP = $(CROSSDEV)llvm-objdump
359360

360361
# Since the no_builtin attribute is not fully supported on Clang
361362
# disable the built-in functions, refer:
@@ -369,15 +370,16 @@ ifeq ($(CONFIG_ARCH_TOOLCHAIN_CLANG),y)
369370

370371
else
371372

372-
CC = $(CROSSDEV)gcc
373-
CXX = $(CROSSDEV)g++
374-
CPP = $(CROSSDEV)gcc -E -P -x c
375-
STRIP = $(CROSSDEV)strip --strip-unneeded
376-
OBJCOPY = $(CROSSDEV)objcopy
377-
OBJDUMP = $(CROSSDEV)objdump
378-
LD = $(CROSSDEV)ld
379-
AR = $(CROSSDEV)ar rcs
380-
NM = $(CROSSDEV)nm
373+
CC = $(CROSSDEV)gcc
374+
CXX = $(CROSSDEV)g++
375+
CPP = $(CROSSDEV)gcc -E -P -x c
376+
STRIP = $(CROSSDEV)strip --strip-unneeded
377+
OBJCOPY = $(CROSSDEV)objcopy
378+
OBJDUMP = $(CROSSDEV)objdump
379+
LD = $(CROSSDEV)ld
380+
AR = $(CROSSDEV)ar rcs
381+
AR_EXTRACT = $(CROSSDEV)ar x
382+
NM = $(CROSSDEV)nm
381383

382384
# Link Time Optimization
383385

‎arch/sparc/src/sparc_v8/Toolchain.defs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ CPP = $(CROSSDEV)gcc -E
122122
LD = $(CROSSDEV)ld
123123
STRIP = $(CROSSDEV)strip --strip-unneeded
124124
AR = $(CROSSDEV)ar rcs
125+
AR = $(CROSSDEV)ar x
125126
NM = $(CROSSDEV)nm
126127
OBJCOPY = $(CROSSDEV)objcopy
127128
OBJDUMP = $(CROSSDEV)objdump

0 commit comments

Comments
 (0)