All of lore.kernel.org
 help / color / mirror / Atom feed
From: Damien Le Moal <damien.lemoal@wdc.com>
To: buildroot <buildroot@buildroot.org>,
	Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Alistair Francis <alistair@alistair23.me>,
	"Yann E . MORIN" <yann.morin.1998@free.fr>
Subject: [Buildroot] [PATCH v5 01/10] package: Makefile.in: fix elf2flt invocation options
Date: Tue, 26 Oct 2021 16:17:19 +0900	[thread overview]
Message-ID: <20211026071728.954356-2-damien.lemoal@wdc.com> (raw)
In-Reply-To: <20211026071728.954356-1-damien.lemoal@wdc.com>

When BR2_BINFMT_FLAT_ONE is selected, elf2flt must be invoked with the
"-r" option to ensure that a single contiguous binary image is created,
regardless of the architecture default image format implemented by
elf2flt.

Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
---
 package/Makefile.in | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 86db62ba5b..50ccd0f25d 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -178,13 +178,19 @@ TARGET_CXXFLAGS += -fno-dwarf2-cfi-asm
 endif
 
 ifeq ($(BR2_BINFMT_FLAT),y)
-TARGET_CFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\
-	-Wl$(comma)-elf2flt)
-TARGET_CXXFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\
-	-Wl$(comma)-elf2flt)
-TARGET_FCFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\
+ifeq ($(BR2_BINFMT_FLAT_ONE),y)
+ELF2FLT_FLAGS = $(if $($(PKG)_FLAT_STACKSIZE),\
+	-Wl$(comma)-elf2flt="-r -s$($(PKG)_FLAT_STACKSIZE)",\
+        -Wl$(comma)-elf2flt=-r)
+else
+ELF2FLT_FLAGS = $(if $($(PKG)_FLAT_STACKSIZE),\
+	-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\
 	-Wl$(comma)-elf2flt)
-TARGET_LDFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt)
+endif
+TARGET_CFLAGS += $(ELF2FLT_FLAGS)
+TARGET_CXXFLAGS += $(ELF2FLT_FLAGS)
+TARGET_FCFLAGS += $(ELF2FLT_FLAGS)
+TARGET_LDFLAGS += $(ELF2FLT_FLAGS)
 endif
 
 ifeq ($(BR2_BINFMT_FLAT_SHARED),y)
-- 
2.31.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

  reply	other threads:[~2021-10-26  7:24 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-26  7:17 [Buildroot] [PATCH v5 00/10] Add RV64 NOMMU and Canaan K210 SoC support Damien Le Moal
2021-10-26  7:17 ` Damien Le Moal [this message]
2021-10-27 13:37   ` [Buildroot] [PATCH v5 01/10] package: Makefile.in: fix elf2flt invocation options Peter Korsgaard
2021-10-26  7:17 ` [Buildroot] [PATCH v5 02/10] package/elf2flt: add RISC-V 64-bits support Damien Le Moal
2021-10-27 13:38   ` Peter Korsgaard
2021-10-28  0:35     ` Damien Le Moal
2021-10-28  6:30       ` Peter Korsgaard
2021-10-26  7:17 ` [Buildroot] [PATCH v5 03/10] package/Makefile.in: Fix NOMMU RISC-V 64-bits toolchain base name Damien Le Moal
2021-10-27  3:26   ` Alistair Francis
2021-10-27 13:38   ` Peter Korsgaard
2021-10-26  7:17 ` [Buildroot] [PATCH v5 04/10] arch/config: Make RISC-V 64-bits MMU optional Damien Le Moal
2021-10-27 13:38   ` Peter Korsgaard
2021-10-26  7:17 ` [Buildroot] [PATCH v5 05/10] board: Add Sipeed MAIX-bit support Damien Le Moal
2021-10-27 13:51   ` Peter Korsgaard
2021-10-28  1:07     ` Damien Le Moal
     [not found]       ` <e6eb0eda-20db-dfd6-c3d6-47db131bc247@gmail.com>
2021-10-28  2:24         ` Damien Le Moal
2021-10-28  7:01       ` Peter Korsgaard
2021-12-30 20:27   ` Thomas Petazzoni
2021-12-30 20:29     ` Thomas Petazzoni
2021-12-31  0:39     ` Damien Le Moal
2022-01-03 15:25       ` Thomas Petazzoni
2022-02-15 23:37         ` Damien Le Moal
2022-02-16  7:54           ` Thomas Petazzoni via buildroot
2021-10-26  7:17 ` [Buildroot] [PATCH v5 06/10] board: Add Sipeed MAIX-Go support Damien Le Moal
2021-10-26  7:17 ` [Buildroot] [PATCH v5 07/10] board: Add Sipeed MAIXDUINO support Damien Le Moal
2021-10-26  7:17 ` [Buildroot] [PATCH v5 08/10] board: Add Sipeed MAIX-Dock support Damien Le Moal
2021-10-26  7:17 ` [Buildroot] [PATCH v5 09/10] board: Add Canaan KD233 support Damien Le Moal
2021-10-26  7:17 ` [Buildroot] [PATCH v5 10/10] board: Document Canaan K210 based boards support Damien Le Moal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211026071728.954356-2-damien.lemoal@wdc.com \
    --to=damien.lemoal@wdc.com \
    --cc=alistair@alistair23.me \
    --cc=buildroot@buildroot.org \
    --cc=thomas.petazzoni@bootlin.com \
    --cc=yann.morin.1998@free.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.