Merge de2174bc46 into 91c71ed00a

arch/arm/src/common/Toolchain.defs

@@ -546,9 +546,7 @@ ifeq ($(CONFIG_PIC),y)
   # Generate an executable elf, need to ignore undefined symbols
   LDELFFLAGS += --unresolved-symbols=ignore-in-object-files --emit-relocs
 else
-  ifneq ($(CONFIG_BINFMT_ELF_EXECUTABLE),y)
-    LDELFFLAGS += -r
-  endif
+  LDELFFLAGS += -r
 endif
 
 LDELFFLAGS +=  -e main -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)

arch/arm/src/qemu/Kconfig

@@ -15,7 +15,6 @@ config ARCH_CHIP_QEMU_CORTEXA7
 	bool "Qemu virtual Processor (cortex-a7)"
 	select ARCH_CORTEXA7
 	select ARCH_HAVE_ADDRENV
-	select ARCH_HAVE_ELF_EXECUTABLE
 	select ARCH_HAVE_LOWVECTORS
 	select ARCH_HAVE_MULTICPU
 	select ARCH_NEED_ADDRENV_MAPPING

include/nuttx/addrenv.h

@@ -29,8 +29,6 @@
 
 #include <nuttx/config.h>
 
-#ifndef __ASSEMBLY__
-
 #ifdef CONFIG_BUILD_KERNEL
 #  include <signal.h>
 #endif
@@ -42,8 +40,6 @@
 
 #include <arch/arch.h>
 
-#endif /* __ASSEMBLY__ */
-
 #ifdef CONFIG_ARCH_ADDRENV
 
 /****************************************************************************
@@ -245,9 +241,6 @@
      (CONFIG_ARCH_PGPOOL_VBASE + CONFIG_ARCH_PGPOOL_SIZE)
 
 #endif
-
-#ifndef __ASSEMBLY__
-
 /****************************************************************************
  * Public Type Definitions
  ****************************************************************************/
@@ -258,6 +251,8 @@ struct tcb_s;                  /* Forward reference to TCB */
  * Public Types
  ****************************************************************************/
 
+#ifndef __ASSEMBLY__
+
 struct addrenv_s
 {
   struct arch_addrenv_s addrenv; /* The address environment page directory  */

libs/libc/.gitignore

@@ -1,3 +1,2 @@
 /exec_symtab.c
 /modlib_symtab.c
-modlib/gnu-elf.ld

libs/libc/Makefile

@@ -183,10 +183,6 @@ context:: bin kbin
 ifeq ($(CONFIG_LIBC_ZONEINFO_ROMFS),y)
 	$(Q) $(MAKE) -C zoneinfo context BIN=$(BIN)
 endif
-ifeq ($(CONFIG_LIBC_MODLIB),y)
-	$(Q) $(MAKE) -C modlib context
-endif
-
 
 # Dependencies
 
@@ -214,7 +210,6 @@ depend:: .depend
 
 clean::
 	$(Q) $(MAKE) -C zoneinfo clean BIN=$(BIN)
-	$(Q) $(MAKE) -C modlib clean
 	$(call DELFILE, $(BIN))
 	$(call DELFILE, $(KBIN))
 	$(call CLEAN)
@@ -223,7 +218,6 @@ clean::
 
 distclean:: clean
 	$(Q) $(MAKE) -C zoneinfo distclean BIN=$(BIN)
-	$(Q) $(MAKE) -C modlib distclean
 	$(call DELFILE, exec_symtab.c)
 	$(call DELFILE, .depend)
 	$(call DELDIR, bin)

libs/libc/modlib/Makefile

@@ -1,40 +0,0 @@
-############################################################################
-# libs/libc/modlib/Makefile
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.  The
-# ASF licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-############################################################################
-
-include $(TOPDIR)/Make.defs
-
-# Generate gnu-elf.ld from gnu-elf.ld.in
-
-gnu-elf.ld: gnu-elf.ld.in
-	$(call PREPROCESS, $<, $@)
-
-# Create initial context
-
-context: gnu-elf.ld
-
-.PHONY: context clean distclean
-
-clean:
-	$(call CLEAN)
-
-distclean: clean
-	$(call DELFILE, gnu-elf.ld)

libs/libc/modlib/gnu-elf.ld

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/modlib/gnu-elf.ld.in
+ * libs/libc/modlib/gnu-elf.ld
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,23 +18,9 @@
  *
  ****************************************************************************/
 
-
-#include <nuttx/config.h>
-
-#if defined(CONFIG_BUILD_KERNEL) && defined(CONFIG_BINFMT_ELF_EXECUTABLE)
-#  define __ASSEMBLY__
-#  include <nuttx/addrenv.h>
-
-#  define TEXT CONFIG_ARCH_TEXT_VBASE
-#  define DATA CONFIG_ARCH_DATA_VBASE + ARCH_DATA_RESERVE_SIZE
-#else
-#  define TEXT 0x0
-#  define DATA
-#endif
-
 SECTIONS
 {
-  .text TEXT :
+  .text 0x00000000 :
     {
       _stext = . ;
       *(.text)
@@ -72,7 +58,7 @@ SECTIONS
       _erodata = . ;
     }
 
-  .data DATA :
+  .data :
     {
       _sdata = . ;
       *(.data)