From 8ffa77b1679e9e661429b35071173324a5b6c124 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Thu, 3 Oct 2019 14:08:32 -0600 Subject: [PATCH] tools/mkexport.sh: Should export full content for flat build even with CONFIG_BUILD_LOADABLE. --- tools/Config.mk | 8 +++++--- tools/Makefile.unix | 2 -- tools/Makefile.win | 2 -- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/Config.mk b/tools/Config.mk index 01085e3a9b..be66d8bef2 100644 --- a/tools/Config.mk +++ b/tools/Config.mk @@ -143,7 +143,8 @@ endef # CXXFLAGS - Options to pass to the C++ compiler # # '.cxx_CXXFLAGS += ' may also be used, as an example, to -# change the options used with the single file .cxx +# change the options used with the single file .cxx. The +# extension .cpp could also be used. The same applies mutatis mutandis. define COMPILEXX @echo "CXX: $1" @@ -166,8 +167,9 @@ endef # files # AFLAGS - Options to pass to the C+compiler # -# '.s_CFLAGS += ' may also be used, as an example, to change -# the options used with the single file .s +# '.s_AFLAGS += ' may also be used, as an example, to change +# the options used with the single file .s. The extension .asm +# is used by some toolchains. The same applies mutatis mutandis. define ASSEMBLE @echo "AS: $1" diff --git a/tools/Makefile.unix b/tools/Makefile.unix index 5727cb23e4..5550357a78 100644 --- a/tools/Makefile.unix +++ b/tools/Makefile.unix @@ -165,8 +165,6 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y) MKEXPORT_ARGS += -u else ifeq ($(CONFIG_BUILD_KERNEL),y) MKEXPORT_ARGS += -u -else ifeq ($(CONFIG_BUILD_LOADABLE),y) -MKEXPORT_ARGS += -u endif ifneq ($(APPDIR),) diff --git a/tools/Makefile.win b/tools/Makefile.win index ddd4efba08..7e6b974f9f 100644 --- a/tools/Makefile.win +++ b/tools/Makefile.win @@ -147,8 +147,6 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y) MKEXPORT_ARGS += -u else ifeq ($(CONFIG_BUILD_KERNEL),y) MKEXPORT_ARGS += -u -else ifeq ($(CONFIG_BUILD_LOADABLE),y) -MKEXPORT_ARGS += -u endif ifneq ($(APPDIR),)