Peter Korsgaard | dae0d7b | 2018-04-01 10:46:42 +0200 | [diff] [blame] | 1 | From e6c498f68b61057fb5505e41c3858c2b5d223227 Mon Sep 17 00:00:00 2001 |
| 2 | From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| 3 | Date: Sun, 7 Aug 2016 23:20:00 +0200 |
| 4 | Subject: [PATCH] Makefile.arm: remove -march flags |
| 5 | |
| 6 | The provided -march flags, especially for ARMv5 and ARMv6 may not |
| 7 | necessarily match the needed ones: for ARMv5, it might be armv5, |
| 8 | armv5te, armv5t, etc. If the wrong one is used, the incorrect toolchain |
| 9 | sysroot can be used in a multilib toolchain. |
| 10 | |
| 11 | Therefore, let the user building OpenBLAS pass the appropriate -march |
| 12 | flag. |
| 13 | |
| 14 | The other flags, such as -mfpu=vfp or -mfloat-abi=hard are kept, as they |
| 15 | are actually required for the build to proceed (OpenBLAS uses VFP |
| 16 | instructions, and assume an EABIhf ABI). |
| 17 | |
| 18 | [Peter: update for v0.2.20] |
| 19 | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| 20 | Signed-off-by: Peter Korsgaard <peter@korsgaard.com> |
| 21 | --- |
| 22 | Makefile.arm | 13 ++++--------- |
| 23 | 1 file changed, 4 insertions(+), 9 deletions(-) |
| 24 | |
| 25 | diff --git a/Makefile.arm b/Makefile.arm |
| 26 | index eedd39b7..b5d80f8e 100644 |
| 27 | --- a/Makefile.arm |
| 28 | +++ b/Makefile.arm |
| 29 | @@ -1,7 +1,7 @@ |
| 30 | ifeq ($(CORE), $(filter $(CORE),ARMV7 CORTEXA9 CORTEXA15)) |
| 31 | ifeq ($(OSNAME), Android) |
| 32 | -CCOMMON_OPT += -mfpu=neon -march=armv7-a |
| 33 | -FCOMMON_OPT += -mfpu=neon -march=armv7-a |
| 34 | +CCOMMON_OPT += -mfpu=neon |
| 35 | +FCOMMON_OPT += -mfpu=neon |
| 36 | else |
| 37 | CCOMMON_OPT += -mfpu=vfpv3 -march=armv7-a |
| 38 | FCOMMON_OPT += -mfpu=vfpv3 -march=armv7-a |
| 39 | @@ -9,11 +9,6 @@ endif |
| 40 | endif |
| 41 | |
| 42 | ifeq ($(CORE), ARMV6) |
| 43 | -CCOMMON_OPT += -mfpu=vfp -march=armv6 |
| 44 | -FCOMMON_OPT += -mfpu=vfp -march=armv6 |
| 45 | -endif |
| 46 | - |
| 47 | -ifeq ($(CORE), ARMV5) |
| 48 | -CCOMMON_OPT += -march=armv5 |
| 49 | -FCOMMON_OPT += -march=armv5 |
| 50 | +CCOMMON_OPT += -mfpu=vfp |
| 51 | +FCOMMON_OPT += -mfpu=vfp |
| 52 | endif |
| 53 | -- |
| 54 | 2.11.0 |
| 55 | |