mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 16/23] sandbox: support forcing 32-bit x86
Date: Mon, 11 May 2020 09:21:33 +0200	[thread overview]
Message-ID: <20200511072140.29610-17-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20200511072140.29610-1-a.fatoum@pengutronix.de>

If gcc supports multiple architectures, barebox uses only the default
when compiling for ARCH=sandbox, this is e.g. the case with compilers
that generate borth 32- and 64-bit x86 exectuables.

There can be good reasons to force 32-bit though, e.g. to reduce memory
consumption while fuzzing or to temporarily avoid 32-to-64-bit warnings,
while running the static analyzer. Add an option for this.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/sandbox/Kconfig     |  7 +++++++
 arch/sandbox/Makefile    | 12 +++++++++++-
 arch/sandbox/os/Makefile |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig
index e116fe2deb0b..3f10709021a7 100644
--- a/arch/sandbox/Kconfig
+++ b/arch/sandbox/Kconfig
@@ -27,6 +27,13 @@ config SANDBOX_UNWIND
 config CC_IS_64BIT
 	def_bool $(success,$(srctree)/scripts/gcc-64bitptr.sh $(CC))
 
+config CC_HAS_LINUX_I386_SUPPORT
+	def_bool $(cc-option,-m32) && $(ld-option,-m elf_i386)
+
 config 64BIT
 	bool
+	default n if SANDBOX_LINUX_I386
 	default CC_IS_64BIT
+
+config SANDBOX_LINUX_I386
+	bool "32-bit x86 barebox" if CC_HAS_LINUX_I386_SUPPORT
diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile
index c205f47ff491..34162948185a 100644
--- a/arch/sandbox/Makefile
+++ b/arch/sandbox/Makefile
@@ -56,11 +56,21 @@ ifeq ($(CONFIG_UBSAN),y)
 SANITIZER_LIBS += -fsanitize=undefined
 endif
 
-cmd_barebox__ = $(CC) -o $@ -Wl,-T,$(BAREBOX_LDS) \
+ifeq ($(CONFIG_SANDBOX_LINUX_I386),y)
+KBUILD_CFLAGS += -m32
+KBUILD_LDFLAGS += -m elf_i386
+KBUILD_AFLAGS += -m32
+BAREBOX_LDFLAGS += -m32
+endif
+
+BAREBOX_LDFLAGS += \
+	-Wl,-T,$(BAREBOX_LDS) \
 	-Wl,--start-group $(BAREBOX_OBJS) -Wl,--end-group \
 	-lrt -lpthread $(SDL_LIBS) $(FTDI1_LIBS) \
 	$(SANITIZER_LIBS)
 
+cmd_barebox__ = $(CC) -o $@ $(BAREBOX_LDFLAGS)
+
 common-y += $(BOARD) arch/sandbox/os/ arch/sandbox/lib/
 
 common-$(CONFIG_OFTREE) += arch/sandbox/dts/
diff --git a/arch/sandbox/os/Makefile b/arch/sandbox/os/Makefile
index 40306b5ffed8..8c294dae1bd8 100644
--- a/arch/sandbox/os/Makefile
+++ b/arch/sandbox/os/Makefile
@@ -10,7 +10,7 @@ endif
 
 KBUILD_CPPFLAGS += -DCONFIG_MALLOC_SIZE=$(CONFIG_MALLOC_SIZE)
 
-KBUILD_CFLAGS := -Wall
+KBUILD_CFLAGS += -Wall
 NOSTDINC_FLAGS :=
 
 obj-y = common.o tap.o
-- 
2.26.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2020-05-11  7:21 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-11  7:21 [PATCH 00/23] sandbox: support COMPILE_TESTing drivers Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 01/23] scripts: import Linux Kconfig.include Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 02/23] sandbox: define CONFIG_64BIT as appropriate Ahmad Fatoum
2020-05-11 10:00   ` Roland Hieber
2020-05-12  7:14     ` Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 03/23] sandbox: asm: bitsperlong.h: detect bitness according to 64BIT symbol Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 04/23] include: io.h: provide (in|out)_(le|be)(16|32) helpers for all archs Ahmad Fatoum
2020-05-12  7:11   ` Sascha Hauer
2020-05-12  7:13     ` Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 05/23] ARM: asm/io.h: fall back to asm-generic out_be32 and friends Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 06/23] clocksource: arm_global_timer.c: remove unused asm/ header Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 07/23] mtd: nand: orion: depend on ARM Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 08/23] ddr: fsl: " Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 09/23] net: fec_imx: depend on HAS_DMA Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 10/23] net: macb: " Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 11/23] sandbox: implement stub physical virtual translation Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 12/23] sandbox: asm: implement stub DMA functions Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 13/23] sandbox: select HAS_DMA Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 14/23] ARM: atomic.h: move generic implementation to asm-generic Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 15/23] sandbox: asm: implement <asm/atomic.h> Ahmad Fatoum
2020-05-12  7:26   ` Sascha Hauer
2020-05-11  7:21 ` Ahmad Fatoum [this message]
2020-05-11  7:21 ` [PATCH 17/23] usb: xhci-hcd: remove unused #include <asm/cache.h> Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 18/23] usb: xhci-hcd: replace opencoded non-atomic 64-bit MMIO with lo_hi helper Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 19/23] include: bitops: fix dead increment in fls() and ffs() Ahmad Fatoum
2020-05-12  7:31   ` Sascha Hauer
2020-05-11  7:21 ` [PATCH 20/23] commands: tftp: drop unused variable Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 21/23] commands: test: drop dead assignment Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 22/23] sandbox: os: add_image: fix memory leak Ahmad Fatoum
2020-05-11  7:21 ` [PATCH 23/23] mtd: nand: base: fix use of uninitialized struct member Ahmad Fatoum

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=20200511072140.29610-17-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox