[BREAKING]libc/elf: rename modlib to libelf

Documentation/applications/examples/elf/index.rst

@@ -54,9 +54,9 @@ options:
 
 6. Linker scripts. You might also want to use a linker scripts to combine
    sections better. An example linker script is at
-   ``nuttx/binfmt/libelf/gnu-elf.ld``. That example might have to be tuned for
+   ``nuttx/binfmt/elf/gnu-elf.ld``. That example might have to be tuned for
    your particular linker output to position additional sections correctly. The
    GNU LD ``LDELFFLAGS`` then might be::
 
-     LDELFFLAGS = -r -e main -T$(TOPDIR)/binfmt/libelf/gnu-elf.ld
+     LDELFFLAGS = -r -e main -T$(TOPDIR)/binfmt/elf/gnu-elf.ld
 

Documentation/applications/examples/module/index.rst

@@ -55,8 +55,8 @@ configuration options:
 
 6. Linker scripts. You might also want to use a linker scripts to combine
    sections better. An example linker script is at
-   ``nuttx/libc/modlib/gnu-elf.ld``. That example might have to be tuned for your
+   ``nuttx/libc/elf/gnu-elf.ld``. That example might have to be tuned for your
    particular linker output to position additional sections correctly. The GNU
    LD ``LDMODULEFLAGS`` then might be::
 
-     LDMODULEFLAGS = -r -e module_initialize -T$(TOPDIR)/libc/modlib/gnu-elf.ld
+     LDMODULEFLAGS = -r -e module_initialize -T$(TOPDIR)/libc/elf/gnu-elf.ld

Documentation/applications/examples/posix_spawn/index.rst

@@ -66,8 +66,8 @@ Test-specific configuration options:
 
 6. Linker scripts. You might also want to use a linker scripts to combine
    sections better. An example linker script is at
-   ``nuttx/binfmt/libelf/gnu-elf.ld``. That example might have to be tuned for
+   ``nuttx/binfmt/elf/gnu-elf.ld``. That example might have to be tuned for
    your particular linker output to position additional sections correctly. The
    GNU LD ``LDELFFLAGS`` then might be::
 
-     LDELFFLAGS = -r -e main -T$(TOPDIR)/binfmt/libelf/gnu-elf.ld
+     LDELFFLAGS = -r -e main -T$(TOPDIR)/binfmt/elf/gnu-elf.ld

Documentation/applications/examples/sotest/index.rst

@@ -53,8 +53,8 @@ system. At run time, the shared library is installed and exercised. Requires
 
 6. Linker scripts. You might also want to use a linker scripts to combine
    sections better. An example linker script is at
-   ``nuttx/libc/modlib/gnu-elf.ld``. That example might have to be tuned for your
+   ``nuttx/libc/elf/gnu-elf.ld``. That example might have to be tuned for your
    particular linker output to position additional sections correctly. The GNU
    LD ``LDMODULEFLAGS`` then might be::
 
-     LDMODULEFLAGS = -r -e module_initialize -T$(TOPDIR)/libc/modlib/gnu-elf.ld
+     LDMODULEFLAGS = -r -e module_initialize -T$(TOPDIR)/libc/elf/gnu-elf.ld

Documentation/components/libs/libc/index.rst

@@ -43,7 +43,7 @@ functions.  So we have::
   inttypes  - inttypes.h
   machine   - Various architecture-specific implementations.
   math      - math.h
-  modlib    - Part of module and shared library logic: nuttx/lib/modlib.h
+  elf    - Part of module and shared library logic: nuttx/lib/elf.h
   net       - Various network-related header files: netinet/ether.h, arpa/inet.h
   pthread   - pthread.h
   pwd       - pwd.h

Documentation/legacy_README.md

@@ -536,7 +536,7 @@ A macOS port is available at: <https://github.com/discoteq/flock>
 
   * Xcode (the native compiler and the rest of the toolchain)
 
-  * ELF toolchain (if you want to build modules for CONFIG_LIBC_MODLIB)
+  * ELF toolchain (if you want to build modules for CONFIG_LIBC_ELF)
 
     brew install x86_64-elf-gcc
 

Documentation/platforms/arm/samv7/boards/samv71-xult/README.txt

@@ -1819,10 +1819,10 @@ Configuration sub-directories
          CONFIG_FS_ROMFS=y
          CONFIG_LIBC_ARCH_ELF=y
          CONFIG_MODULE=y
-         CONFIG_LIBC_MODLIB=y
-         CONFIG_MODLIB_ALIGN_LOG2=2
-         CONFIG_MODLIB_BUFFERINCR=32
-         CONFIG_MODLIB_BUFFERSIZE=128
+         CONFIG_LIBC_ELF=y
+         CONFIG_LIBC_ELF_ALIGN_LOG2=2
+         CONFIG_LIBC_ELF_BUFFERINCR=32
+         CONFIG_LIBC_ELF_BUFFERSIZE=128
 
        Add the following for testing shared libraries in the FLAT
        build:

Documentation/platforms/arm/stm32f4/boards/olimex-stm32-p407/index.rst

@@ -389,11 +389,11 @@ the nsh configuration include these additions to the configuration file::
       CONFIG_FS_ROMFS=y
       CONFIG_LIBC_ARCH_ELF=y
       CONFIG_MODULE=y
-      CONFIG_LIBC_MODLIB=y
-      CONFIG_MODLIB_MAXDEPEND=2
-      CONFIG_MODLIB_ALIGN_LOG2=2
-      CONFIG_MODLIB_BUFFERSIZE=128
-      CONFIG_MODLIB_BUFFERINCR=32
+      CONFIG_LIBC_ELF=y
+      CONFIG_LIBC_ELF_MAXDEPEND=2
+      CONFIG_LIBC_ELF_ALIGN_LOG2=2
+      CONFIG_LIBC_ELF_BUFFERSIZE=128
+      CONFIG_LIBC_ELF_BUFFERINCR=32
 
 The could be followed may be added for testing shared libraries in the
 FLAT build using apps/examples/sotest (assuming that you also have SD
@@ -448,10 +448,10 @@ NOTES:
          CONFIG_FS_ROMFS=y
          CONFIG_LIBC_ARCH_ELF=y
          CONFIG_MODULE=y
-         CONFIG_LIBC_MODLIB=y
-         CONFIG_MODLIB_ALIGN_LOG2=2
-         CONFIG_MODLIB_BUFFERINCR=32
-         CONFIG_MODLIB_BUFFERSIZE=128
+         CONFIG_LIBC_ELF=y
+         CONFIG_LIBC_ELF_ALIGN_LOG2=2
+         CONFIG_LIBC_ELF_BUFFERINCR=32
+         CONFIG_LIBC_ELF_BUFFERSIZE=128
 
      Add the following for testing shared libraries in the FLAT
      build::

Documentation/platforms/arm/stm32f4/boards/stm32f4discovery/index.rst

@@ -1438,11 +1438,11 @@ other NSH configurations include these additions to the configuration file::
       CONFIG_FS_ROMFS=y
       CONFIG_LIBC_ARCH_ELF=y
       CONFIG_MODULE=y
-      CONFIG_LIBC_MODLIB=y
-      CONFIG_MODLIB_MAXDEPEND=2
-      CONFIG_MODLIB_ALIGN_LOG2=2
-      CONFIG_MODLIB_BUFFERSIZE=128
-      CONFIG_MODLIB_BUFFERINCR=32
+      CONFIG_LIBC_ELF=y
+      CONFIG_LIBC_ELF_MAXDEPEND=2
+      CONFIG_LIBC_ELF_ALIGN_LOG2=2
+      CONFIG_LIBC_ELF_BUFFERSIZE=128
+      CONFIG_LIBC_ELF_BUFFERINCR=32
 
 The could be followed may be added for testing shared libraries in the
 FLAT build using apps/examples/sotest (assuming that you also have SD

Documentation/platforms/sim/sim/boards/sim/index.rst

@@ -748,14 +748,14 @@ apps/interpreters/minibasic.
 module
 ------
 
-This is a configuration to test CONFIG_LIBC_MODLIB with 64-bit modules.
+This is a configuration to test CONFIG_LIBC_ELF with 64-bit modules.
 This has apps/examples/module enabled.
 This configuration is intended for 64-bit host OS.
 
 module32
 --------
 
-This is a configuration to test CONFIG_LIBC_MODLIB with CONFIG_SIM_M32
+This is a configuration to test CONFIG_LIBC_ELF with CONFIG_SIM_M32
 and 32-bit modules.
 This has apps/examples/module enabled.
 This configuration is intended for 64-bit host OS.
@@ -1353,14 +1353,14 @@ with an MTD RAM driver to simulate the FLASH part.
 sotest
 ------
 
-This is a configuration to test CONFIG_LIBC_MODLIB with 64-bit modules.
+This is a configuration to test CONFIG_LIBC_ELF with 64-bit modules.
 This has apps/examples/sotest enabled.
 This configuration is intended for 64-bit host OS.
 
 sotest32
 --------
 
-This is a configuration to test CONFIG_LIBC_MODLIB with CONFIG_SIM_M32
+This is a configuration to test CONFIG_LIBC_ELF with CONFIG_SIM_M32
 and 32-bit modules.
 This has apps/examples/sotest enabled.
 This configuration is intended for 64-bit host OS.

Kconfig

@@ -801,7 +801,7 @@ endif # DEBUG_AUDIO
 config DEBUG_BINFMT
 	bool "Binary Loader Debug Features"
 	default n
-	depends on !BINFMT_DISABLE || LIBC_MODLIB
+	depends on !BINFMT_DISABLE || LIBC_ELF
 	---help---
 		Enable binary loader debug features.
 

arch/arm/src/common/Toolchain.defs

@@ -531,7 +531,7 @@ endif
 # Loadable module definitions
 
 CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden -mlong-calls # --target1-abs
-LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
+LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
 
 # ELF module definitions
 
@@ -558,7 +558,7 @@ ifneq ($(CONFIG_BUILD_KERNEL),y)
   LDELFFLAGS += $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)crt0.o
 endif
 
-LDELFFLAGS += -e __start -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
+LDELFFLAGS += -e __start -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)
 
 # Zig toolchain
 

arch/arm64/src/Toolchain.defs

@@ -240,7 +240,7 @@ endif
 # Loadable module definitions
 
 CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden # --target1-abs
-LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
+LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
 
 # ELF module definitions
 
@@ -254,4 +254,4 @@ ifneq ($(CONFIG_BUILD_KERNEL),y)
 
   LDELFFLAGS += $(TOPDIR)$(DELIM)arch$(DELIM)arm64$(DELIM)src$(DELIM)crt0.o
 endif
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
+LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

arch/avr/src/avr/Toolchain.defs

@@ -173,12 +173,12 @@ endif
 # Loadable module definitions
 
 CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
-LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
+LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
 
 # ELF module definitions
 
 CELFFLAGS = $(CFLAGS) -fvisibility=hidden
 CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
 
 LDELFFLAGS = -r -e __start
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
+LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

arch/avr/src/avr32/Toolchain.defs

@@ -103,12 +103,12 @@ endif
 ## Loadable module definitions
 
 CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
-LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
+LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
 
 # ELF module definitions
 
 CELFFLAGS = $(CFLAGS) -fvisibility=hidden
 CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
 
 LDELFFLAGS = -r -e __start
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
+LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

arch/ceva/src/xc5/Toolchain.defs

@@ -92,12 +92,12 @@ CPP = $(CROSSDEV)/cevaxccc -mquiet -Wa,-quiet -E -P -x c
 # Loadable module definitions
 
 CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
-LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
+LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
 
 # ELF module definitions
 
 CELFFLAGS = $(CFLAGS) -fvisibility=hidden
 CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
 
 LDELFFLAGS = -r -e __start
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
+LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

arch/ceva/src/xm6/Toolchain.defs

@@ -97,12 +97,12 @@ CPP = $(CROSSDEV)/cevaxm6cc -mquiet -Wa,-quiet -E -P -x c
 # Loadable module definitions
 
 CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
-LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
+LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
 
 # ELF module definitions
 
 CELFFLAGS = $(CFLAGS) -fvisibility=hidden
 CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
 
 LDELFFLAGS = -r -e __start
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
+LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

arch/mips/src/mips32/Toolchain.defs

@@ -318,12 +318,12 @@ endif
 # Loadable module definitions
 
 CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
-LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
+LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
 
 # ELF module definitions
 
 CELFFLAGS = $(CFLAGS) -fvisibility=hidden
 CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
 
 LDELFFLAGS = -r -e __start
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
+LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

arch/misoc/src/lm32/Toolchain.defs

@@ -134,12 +134,12 @@ endif
 # Loadable module definitions
 
 CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
-LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
+LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
 
 # ELF module definitions
 
 CELFFLAGS = $(CFLAGS) -fvisibility=hidden
 CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
 
 LDELFFLAGS = -r -e __start
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
+LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

arch/misoc/src/minerva/Toolchain.defs

@@ -82,12 +82,12 @@ endif
 # Loadable module definitions
 
 CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
-LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
+LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
 
 # ELF module definitions
 
 CELFFLAGS = $(CFLAGS) -fvisibility=hidden
 CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
 
 LDELFFLAGS = -r -e __start
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
+LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

arch/or1k/src/mor1kx/Toolchain.defs

@@ -120,12 +120,12 @@ endif
 # Loadable module definitions
 
 CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
-LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
+LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
 
 # ELF module definitions
 
 CELFFLAGS = $(CFLAGS) -fvisibility=hidden
 CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
 
 LDELFFLAGS = -r -e __start
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
+LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

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

@@ -426,7 +426,7 @@ endif
 # Loadable module definitions
 
 CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
-LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
+LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
 
 # ELF module definitions
 
@@ -445,7 +445,7 @@ else
   LDELFFLAGS += --oformat elf64-littleriscv
 endif
 
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
+LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
 
 # Zig toolchain
 

arch/sim/CMakeLists.txt

@@ -44,7 +44,7 @@ set_property(
   TARGET nuttx
   APPEND
   PROPERTY NUTTX_ELF_MODULE_LINK_OPTIONS -r -e module_initialize -T
-           ${NUTTX_DIR}/libs/libc/modlib/gnu-elf.ld)
+           ${NUTTX_DIR}/libs/libc/elf/gnu-elf.ld)
 
 if(CONFIG_LIBC_ARCH_ELF_64BIT)
   # For amd64: It seems macOS/x86_64 loads the program text around

arch/sparc/src/sparc_v8/Toolchain.defs

@@ -129,12 +129,12 @@ OBJDUMP = $(CROSSDEV)objdump
 # Loadable module definitions
 
 CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
-LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
+LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
 
 # ELF module definitions
 
 CELFFLAGS = $(CFLAGS) -fvisibility=hidden
 CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
 
 LDELFFLAGS = -r -e __start
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
+LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

arch/tricore/src/common/ToolchainTasking.defs

@@ -131,12 +131,12 @@ ARCHOPTIMIZATION += --pass-c=--no-warnings=$(TASKING_WARNINGS)
 # Loadable module definitions
 
 CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
-LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
+LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
 
 # ELF module definitions
 
 CELFFLAGS = $(CFLAGS) -fvisibility=hidden
 CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
 
 LDELFFLAGS = -r -e __start
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
+LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)

arch/x86/src/common/Toolchain.defs

@@ -83,12 +83,12 @@ AFLAGS := $(CFLAGS) -D__ASSEMBLY__
 # Loadable module definitions
 
 CMODULEFLAGS = $(CFLAGS) -fvisibility=hidden
-LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
+LDMODULEFLAGS = -r -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/elf/gnu-elf.ld)
 
 # ELF module definitions
 
 CELFFLAGS = $(CFLAGS) -fvisibility=hidden
 CXXELFFLAGS = $(CXXFLAGS) -fvisibility=hidden
 
 LDELFFLAGS = -r -e __start
-LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
+LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)elf$(DELIM)gnu-elf.ld)