Skip to content

Commit 9a4b65d

Browse files
anchaoanchao
committed
libc/elf: rename modlib to elf
Renaming "modlib" to "elf" is more in line with the implementation content, which makes it easier for individual developers to understand the capabilities of this module. CONFIG_LIBC_MODLIB -> CONFIG_LIBC_ELF Signed-off-by: chao an <[email protected]>
1 parent cc64c02 commit 9a4b65d

File tree

123 files changed

+791
-788
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+791
-788
lines changed

Diff for: ‎Documentation/applications/examples/elf/index.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ options:
5454

5555
6. Linker scripts. You might also want to use a linker scripts to combine
5656
sections better. An example linker script is at
57-
``nuttx/binfmt/libelf/gnu-elf.ld``. That example might have to be tuned for
57+
``nuttx/binfmt/elf/gnu-elf.ld``. That example might have to be tuned for
5858
your particular linker output to position additional sections correctly. The
5959
GNU LD ``LDELFFLAGS`` then might be::
6060

61-
LDELFFLAGS = -r -e main -T$(TOPDIR)/binfmt/libelf/gnu-elf.ld
61+
LDELFFLAGS = -r -e main -T$(TOPDIR)/binfmt/elf/gnu-elf.ld
6262

Diff for: ‎Documentation/applications/examples/module/index.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ configuration options:
5555

5656
6. Linker scripts. You might also want to use a linker scripts to combine
5757
sections better. An example linker script is at
58-
``nuttx/libc/modlib/gnu-elf.ld``. That example might have to be tuned for your
58+
``nuttx/libc/elf/gnu-elf.ld``. That example might have to be tuned for your
5959
particular linker output to position additional sections correctly. The GNU
6060
LD ``LDMODULEFLAGS`` then might be::
6161

62-
LDMODULEFLAGS = -r -e module_initialize -T$(TOPDIR)/libc/modlib/gnu-elf.ld
62+
LDMODULEFLAGS = -r -e module_initialize -T$(TOPDIR)/libc/elf/gnu-elf.ld

Diff for: ‎Documentation/applications/examples/posix_spawn/index.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ Test-specific configuration options:
6666

6767
6. Linker scripts. You might also want to use a linker scripts to combine
6868
sections better. An example linker script is at
69-
``nuttx/binfmt/libelf/gnu-elf.ld``. That example might have to be tuned for
69+
``nuttx/binfmt/elf/gnu-elf.ld``. That example might have to be tuned for
7070
your particular linker output to position additional sections correctly. The
7171
GNU LD ``LDELFFLAGS`` then might be::
7272

73-
LDELFFLAGS = -r -e main -T$(TOPDIR)/binfmt/libelf/gnu-elf.ld
73+
LDELFFLAGS = -r -e main -T$(TOPDIR)/binfmt/elf/gnu-elf.ld

Diff for: ‎Documentation/applications/examples/sotest/index.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ system. At run time, the shared library is installed and exercised. Requires
5353

5454
6. Linker scripts. You might also want to use a linker scripts to combine
5555
sections better. An example linker script is at
56-
``nuttx/libc/modlib/gnu-elf.ld``. That example might have to be tuned for your
56+
``nuttx/libc/elf/gnu-elf.ld``. That example might have to be tuned for your
5757
particular linker output to position additional sections correctly. The GNU
5858
LD ``LDMODULEFLAGS`` then might be::
5959

60-
LDMODULEFLAGS = -r -e module_initialize -T$(TOPDIR)/libc/modlib/gnu-elf.ld
60+
LDMODULEFLAGS = -r -e module_initialize -T$(TOPDIR)/libc/elf/gnu-elf.ld

Diff for: ‎Documentation/components/libs/libc/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ functions. So we have::
4343
inttypes - inttypes.h
4444
machine - Various architecture-specific implementations.
4545
math - math.h
46-
modlib - Part of module and shared library logic: nuttx/lib/modlib.h
46+
elf - Part of module and shared library logic: nuttx/lib/elf.h
4747
net - Various network-related header files: netinet/ether.h, arpa/inet.h
4848
pthread - pthread.h
4949
pwd - pwd.h

Diff for: ‎Documentation/legacy_README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ A macOS port is available at: <https://github.com/discoteq/flock>
536536

537537
* Xcode (the native compiler and the rest of the toolchain)
538538

539-
* ELF toolchain (if you want to build modules for CONFIG_LIBC_MODLIB)
539+
* ELF toolchain (if you want to build modules for CONFIG_LIBC_ELF)
540540

541541
brew install x86_64-elf-gcc
542542

Diff for: ‎Documentation/platforms/arm/samv7/boards/samv71-xult/README.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1819,10 +1819,10 @@ Configuration sub-directories
18191819
CONFIG_FS_ROMFS=y
18201820
CONFIG_LIBC_ARCH_ELF=y
18211821
CONFIG_MODULE=y
1822-
CONFIG_LIBC_MODLIB=y
1823-
CONFIG_MODLIB_ALIGN_LOG2=2
1824-
CONFIG_MODLIB_BUFFERINCR=32
1825-
CONFIG_MODLIB_BUFFERSIZE=128
1822+
CONFIG_LIBC_ELF=y
1823+
CONFIG_LIBC_ELF_ALIGN_LOG2=2
1824+
CONFIG_LIBC_ELF_BUFFERINCR=32
1825+
CONFIG_LIBC_ELF_BUFFERSIZE=128
18261826

18271827
Add the following for testing shared libraries in the FLAT
18281828
build:

Diff for: ‎Documentation/platforms/arm/stm32f4/boards/olimex-stm32-p407/index.rst

+9-9
Original file line numberDiff line numberDiff line change
@@ -389,11 +389,11 @@ the nsh configuration include these additions to the configuration file::
389389
CONFIG_FS_ROMFS=y
390390
CONFIG_LIBC_ARCH_ELF=y
391391
CONFIG_MODULE=y
392-
CONFIG_LIBC_MODLIB=y
393-
CONFIG_MODLIB_MAXDEPEND=2
394-
CONFIG_MODLIB_ALIGN_LOG2=2
395-
CONFIG_MODLIB_BUFFERSIZE=128
396-
CONFIG_MODLIB_BUFFERINCR=32
392+
CONFIG_LIBC_ELF=y
393+
CONFIG_LIBC_ELF_MAXDEPEND=2
394+
CONFIG_LIBC_ELF_ALIGN_LOG2=2
395+
CONFIG_LIBC_ELF_BUFFERSIZE=128
396+
CONFIG_LIBC_ELF_BUFFERINCR=32
397397

398398
The could be followed may be added for testing shared libraries in the
399399
FLAT build using apps/examples/sotest (assuming that you also have SD
@@ -448,10 +448,10 @@ NOTES:
448448
CONFIG_FS_ROMFS=y
449449
CONFIG_LIBC_ARCH_ELF=y
450450
CONFIG_MODULE=y
451-
CONFIG_LIBC_MODLIB=y
452-
CONFIG_MODLIB_ALIGN_LOG2=2
453-
CONFIG_MODLIB_BUFFERINCR=32
454-
CONFIG_MODLIB_BUFFERSIZE=128
451+
CONFIG_LIBC_ELF=y
452+
CONFIG_LIBC_ELF_ALIGN_LOG2=2
453+
CONFIG_LIBC_ELF_BUFFERINCR=32
454+
CONFIG_LIBC_ELF_BUFFERSIZE=128
455455

456456
Add the following for testing shared libraries in the FLAT
457457
build::

Diff for: ‎Documentation/platforms/arm/stm32f4/boards/stm32f4discovery/index.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -1438,11 +1438,11 @@ other NSH configurations include these additions to the configuration file::
14381438
CONFIG_FS_ROMFS=y
14391439
CONFIG_LIBC_ARCH_ELF=y
14401440
CONFIG_MODULE=y
1441-
CONFIG_LIBC_MODLIB=y
1442-
CONFIG_MODLIB_MAXDEPEND=2
1443-
CONFIG_MODLIB_ALIGN_LOG2=2
1444-
CONFIG_MODLIB_BUFFERSIZE=128
1445-
CONFIG_MODLIB_BUFFERINCR=32
1441+
CONFIG_LIBC_ELF=y
1442+
CONFIG_LIBC_ELF_MAXDEPEND=2
1443+
CONFIG_LIBC_ELF_ALIGN_LOG2=2
1444+
CONFIG_LIBC_ELF_BUFFERSIZE=128
1445+
CONFIG_LIBC_ELF_BUFFERINCR=32
14461446

14471447
The could be followed may be added for testing shared libraries in the
14481448
FLAT build using apps/examples/sotest (assuming that you also have SD

Diff for: ‎Documentation/platforms/sim/sim/boards/sim/index.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -748,14 +748,14 @@ apps/interpreters/minibasic.
748748
module
749749
------
750750

751-
This is a configuration to test CONFIG_LIBC_MODLIB with 64-bit modules.
751+
This is a configuration to test CONFIG_LIBC_ELF with 64-bit modules.
752752
This has apps/examples/module enabled.
753753
This configuration is intended for 64-bit host OS.
754754

755755
module32
756756
--------
757757

758-
This is a configuration to test CONFIG_LIBC_MODLIB with CONFIG_SIM_M32
758+
This is a configuration to test CONFIG_LIBC_ELF with CONFIG_SIM_M32
759759
and 32-bit modules.
760760
This has apps/examples/module enabled.
761761
This configuration is intended for 64-bit host OS.
@@ -1353,14 +1353,14 @@ with an MTD RAM driver to simulate the FLASH part.
13531353
sotest
13541354
------
13551355

1356-
This is a configuration to test CONFIG_LIBC_MODLIB with 64-bit modules.
1356+
This is a configuration to test CONFIG_LIBC_ELF with 64-bit modules.
13571357
This has apps/examples/sotest enabled.
13581358
This configuration is intended for 64-bit host OS.
13591359

13601360
sotest32
13611361
--------
13621362

1363-
This is a configuration to test CONFIG_LIBC_MODLIB with CONFIG_SIM_M32
1363+
This is a configuration to test CONFIG_LIBC_ELF with CONFIG_SIM_M32
13641364
and 32-bit modules.
13651365
This has apps/examples/sotest enabled.
13661366
This configuration is intended for 64-bit host OS.

Diff for: ‎Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ endif # DEBUG_AUDIO
801801
config DEBUG_BINFMT
802802
bool "Binary Loader Debug Features"
803803
default n
804-
depends on !BINFMT_DISABLE || LIBC_MODLIB
804+
depends on !BINFMT_DISABLE || LIBC_ELF
805805
---help---
806806
Enable binary loader debug features.
807807

Diff for: ‎arch/arm/src/common/Toolchain.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ endif
531531
# Loadable module definitions
532532

533533
CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden -mlong-calls # --target1-abs
534-
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
534+
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
535535

536536
# ELF module definitions
537537

@@ -551,7 +551,7 @@ else
551551
endif
552552
endif
553553

554-
LDELFFLAGS += -e main -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
554+
LDELFFLAGS += -e main -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)
555555

556556
# Zig toolchain
557557

Diff for: ‎arch/arm64/src/Toolchain.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,12 @@ endif
240240
# Loadable module definitions
241241

242242
CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden # --target1-abs
243-
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
243+
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
244244

245245
# ELF module definitions
246246

247247
CELFFLAGS = $(CFLAGS) -fvisibility=hidden -mlong-calls # --target1-abs
248248
CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden -mlong-calls # --target1-abs
249249

250250
LDELFFLAGS = -r -e main
251-
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
251+
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

Diff for: ‎arch/avr/src/avr/Toolchain.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,12 @@ endif
173173
# Loadable module definitions
174174

175175
CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
176-
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
176+
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
177177

178178
# ELF module definitions
179179

180180
CELFFLAGS = $(CFLAGS) -fvisibility=hidden
181181
CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
182182

183183
LDELFFLAGS = -r -e main
184-
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
184+
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

Diff for: ‎arch/avr/src/avr32/Toolchain.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,12 @@ endif
103103
## Loadable module definitions
104104

105105
CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
106-
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
106+
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
107107

108108
# ELF module definitions
109109

110110
CELFFLAGS = $(CFLAGS) -fvisibility=hidden
111111
CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
112112

113113
LDELFFLAGS = -r -e main
114-
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
114+
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

Diff for: ‎arch/ceva/src/xc5/Toolchain.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ CPP = $(CROSSDEV)/cevaxccc -mquiet -Wa,-quiet -E -P -x c
9292
# Loadable module definitions
9393

9494
CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
95-
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
95+
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
9696

9797
# ELF module definitions
9898

9999
CELFFLAGS = $(CFLAGS) -fvisibility=hidden
100100
CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
101101

102102
LDELFFLAGS = -r -e main
103-
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
103+
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

Diff for: ‎arch/ceva/src/xm6/Toolchain.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ CPP = $(CROSSDEV)/cevaxm6cc -mquiet -Wa,-quiet -E -P -x c
9797
# Loadable module definitions
9898

9999
CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
100-
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
100+
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
101101

102102
# ELF module definitions
103103

104104
CELFFLAGS = $(CFLAGS) -fvisibility=hidden
105105
CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
106106

107107
LDELFFLAGS = -r -e main
108-
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
108+
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

Diff for: ‎arch/mips/src/mips32/Toolchain.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -318,12 +318,12 @@ endif
318318
# Loadable module definitions
319319

320320
CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
321-
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
321+
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
322322

323323
# ELF module definitions
324324

325325
CELFFLAGS = $(CFLAGS) -fvisibility=hidden
326326
CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
327327

328328
LDELFFLAGS = -r -e main
329-
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
329+
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

Diff for: ‎arch/misoc/src/lm32/Toolchain.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,12 @@ endif
134134
# Loadable module definitions
135135

136136
CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
137-
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
137+
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
138138

139139
# ELF module definitions
140140

141141
CELFFLAGS = $(CFLAGS) -fvisibility=hidden
142142
CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
143143

144144
LDELFFLAGS = -r -e main
145-
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
145+
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

Diff for: ‎arch/misoc/src/minerva/Toolchain.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ endif
8282
# Loadable module definitions
8383

8484
CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
85-
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
85+
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
8686

8787
# ELF module definitions
8888

8989
CELFFLAGS = $(CFLAGS) -fvisibility=hidden
9090
CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
9191

9292
LDELFFLAGS = -r -e main
93-
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
93+
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

Diff for: ‎arch/or1k/src/mor1kx/Toolchain.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@ endif
120120
# Loadable module definitions
121121

122122
CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
123-
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
123+
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
124124

125125
# ELF module definitions
126126

127127
CELFFLAGS = $(CFLAGS) -fvisibility=hidden
128128
CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
129129

130130
LDELFFLAGS = -r -e main
131-
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
131+
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

Diff for: ‎arch/risc-v/src/common/Toolchain.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ endif
426426
# Loadable module definitions
427427

428428
CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
429-
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
429+
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
430430

431431
# ELF module definitions
432432

@@ -445,7 +445,7 @@ else
445445
LDELFFLAGS += --oformat elf64-littleriscv
446446
endif
447447

448-
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
448+
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
449449

450450
# Zig toolchain
451451

Diff for: ‎arch/sim/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ set_property(
4444
TARGET nuttx
4545
APPEND
4646
PROPERTY NUTTX_ELF_MODULE_LINK_OPTIONS -r -e module_initialize -T
47-
${NUTTX_DIR}/libs/libc/modlib/gnu-elf.ld)
47+
${NUTTX_DIR}/libs/libc/elf/gnu-elf.ld)
4848

4949
if(CONFIG_LIBC_ARCH_ELF_64BIT)
5050
# For amd64: It seems macOS/x86_64 loads the program text around

Diff for: ‎arch/sparc/src/sparc_v8/Toolchain.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,12 @@ OBJDUMP = $(CROSSDEV)objdump
129129
# Loadable module definitions
130130

131131
CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
132-
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
132+
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
133133

134134
# ELF module definitions
135135

136136
CELFFLAGS = $(CFLAGS) -fvisibility=hidden
137137
CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
138138

139139
LDELFFLAGS = -r -e main
140-
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
140+
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

Diff for: ‎arch/tricore/src/common/ToolchainTasking.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,12 @@ ARCHOPTIMIZATION += --pass-c=--no-warnings=$(TASKING_WARNINGS)
131131
# Loadable module definitions
132132

133133
CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
134-
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
134+
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
135135

136136
# ELF module definitions
137137

138138
CELFFLAGS = $(CFLAGS) -fvisibility=hidden
139139
CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
140140

141141
LDELFFLAGS = -r -e main
142-
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
142+
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

Diff for: ‎arch/x86/src/common/Toolchain.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
8383
# Loadable module definitions
8484

8585
CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
86-
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
86+
LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
8787

8888
# ELF module definitions
8989

9090
CELFFLAGS = $(CFLAGS) -fvisibility=hidden
9191
CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
9292

9393
LDELFFLAGS = -r -e main
94-
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
94+
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

0 commit comments

Comments
 (0)