package/openblas/0002-Makefile.arm-remove-march-flags.patch

   1 From 71b9e9b7f080c464777d07bd1a917a1c449d2ef8 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 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  19 ---
  20  Makefile.arm | 24 ++++++++++++------------
  21  1 file changed, 12 insertions(+), 12 deletions(-)
  22
  23 diff --git a/Makefile.arm b/Makefile.arm
  24 index 62bf275..c0d6ab8 100644
  25 --- a/Makefile.arm
  26 +++ b/Makefile.arm
  27 @@ -1,31 +1,31 @@
  28  # ifeq logical or
  29  ifeq ($(CORE), $(filter $(CORE),CORTEXA9 CORTEXA15))
  30  ifeq ($(OSNAME), Android)
  31 -CCOMMON_OPT += -marm -mfpu=neon  -mfloat-abi=hard -march=armv7-a
  32 -FCOMMON_OPT += -marm -mfpu=neon  -mfloat-abi=hard -march=armv7-a
  33 +CCOMMON_OPT += -marm -mfpu=neon  -mfloat-abi=hard
  34 +FCOMMON_OPT += -marm -mfpu=neon  -mfloat-abi=hard
  35  else
  36 -CCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard -march=armv7-a
  37 -FCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard -march=armv7-a
  38 +CCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard
  39 +FCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard
  40  endif
  41  endif
  42
  43  ifeq ($(CORE), ARMV7)
  44  ifeq ($(OSNAME), Android)
  45 -CCOMMON_OPT += -marm -mfpu=neon  -mfloat-abi=hard -march=armv7-a -Wl,--no-warn-mismatch
  46 -FCOMMON_OPT += -marm -mfpu=neon  -mfloat-abi=hard -march=armv7-a -Wl,--no-warn-mismatch
  47 +CCOMMON_OPT += -marm -mfpu=neon  -mfloat-abi=hard -Wl,--no-warn-mismatch
  48 +FCOMMON_OPT += -marm -mfpu=neon  -mfloat-abi=hard -Wl,--no-warn-mismatch
  49  else
  50 -CCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard -march=armv7-a
  51 -FCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard -march=armv7-a
  52 +CCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard
  53 +FCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard
  54  endif
  55  endif
  56
  57  ifeq ($(CORE), ARMV6)
  58 -CCOMMON_OPT += -marm -mfpu=vfp -mfloat-abi=hard  -march=armv6
  59 -FCOMMON_OPT += -marm -mfpu=vfp -mfloat-abi=hard  -march=armv6
  60 +CCOMMON_OPT += -marm -mfpu=vfp -mfloat-abi=hard
  61 +FCOMMON_OPT += -marm -mfpu=vfp -mfloat-abi=hard
  62  endif
  63
  64
  65  ifeq ($(CORE), ARMV5)
  66 -CCOMMON_OPT += -marm -march=armv5
  67 -FCOMMON_OPT += -marm -march=armv5
  68 +CCOMMON_OPT += -marm
  69 +FCOMMON_OPT += -marm
  70  endif
  71 --
  72 2.7.4
  73