| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | From fe9860fd85e49a75bef545e5d9914070491e8002 Mon Sep 17 00:00:00 2001 |
| Brad Bishop | f3fd288 | 2019-06-21 08:06:37 -0400 | [diff] [blame] | 2 | From: Alistair Francis <alistair.francis@wdc.com> |
| 3 | Date: Fri, 15 Feb 2019 14:57:41 -0800 |
| 4 | Subject: [PATCH] Makefile: Don't specify mabi or march |
| 5 | |
| 6 | To avoid |
| 7 | can't link double-float modules with soft-float modules |
| 8 | errors when building 32-bit openSBI don't specify mabi or march. |
| 9 | |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 10 | Upstream-Status: Inappropriate [Fixes a 32-bit OE flow bug] |
| Brad Bishop | f3fd288 | 2019-06-21 08:06:37 -0400 | [diff] [blame] | 11 | Signed-off-by: Alistair Francis <alistair.francis@wdc.com> |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 12 | |
| Brad Bishop | f3fd288 | 2019-06-21 08:06:37 -0400 | [diff] [blame] | 13 | --- |
| 14 | Makefile | 2 -- |
| 15 | 1 file changed, 2 deletions(-) |
| 16 | |
| 17 | diff --git a/Makefile b/Makefile |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 18 | index ccf8ea3..69e5b38 100644 |
| Brad Bishop | f3fd288 | 2019-06-21 08:06:37 -0400 | [diff] [blame] | 19 | --- a/Makefile |
| 20 | +++ b/Makefile |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 21 | @@ -169,7 +169,6 @@ GENFLAGS += $(firmware-genflags-y) |
| 22 | CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2 |
| Brad Bishop | f3fd288 | 2019-06-21 08:06:37 -0400 | [diff] [blame] | 23 | CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls |
| 24 | CFLAGS += -mno-save-restore -mstrict-align |
| 25 | -CFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) |
| 26 | CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) |
| 27 | CFLAGS += $(GENFLAGS) |
| 28 | CFLAGS += $(platform-cflags-y) |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 29 | @@ -183,7 +182,6 @@ CPPFLAGS += $(firmware-cppflags-y) |
| Brad Bishop | f3fd288 | 2019-06-21 08:06:37 -0400 | [diff] [blame] | 30 | ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__ |
| 31 | ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls |
| 32 | ASFLAGS += -mno-save-restore -mstrict-align |
| 33 | -ASFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) |
| 34 | ASFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) |
| 35 | ASFLAGS += $(GENFLAGS) |
| 36 | ASFLAGS += $(platform-asflags-y) |