[openblas] 02/04: Fix crash with illegal instruction on armhf with static libraries.

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository openblas.

commit 55cbedee935dffb2eec44e05db1c3ad945000fd0
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Apr 29 17:59:07 2015 +0200

    Fix crash with illegal instruction on armhf with static libraries.
    
    + d/p/arm-gcc-flags.patch: enforce -march=armv7-a and -mfpu=vfpv3-d16 flags.
    
    Git-Dch: Full
---
 debian/patches/arm-gcc-flags.patch | 16 ++++++++--------
 debian/rules                       |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/patches/arm-gcc-flags.patch b/debian/patches/arm-gcc-flags.patch
index e1042aa..f4ed46a 100644
--- a/debian/patches/arm-gcc-flags.patch
+++ b/debian/patches/arm-gcc-flags.patch
@@ -1,22 +1,22 @@
-Description: Remove custom GCC flags on ARM CPUs
+Description: Use flags suitable for armhf port when TARGET=ARMV6
+ See debian/rules for an explanation of why we can't use TARGET=ARMV7 on armhf.
+ Also, if we don't explicitly set the -march and -mfpu flags, the resulting
+ static libraries crash with SIGILL (reason not yet elucidated).
 Author: Sébastien Villemot <sebastien at debian.org>
 Forwarded: not-needed
-Last-Update: 2014-06-15
+Last-Update: 2015-04-29
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/Makefile.arm
 +++ b/Makefile.arm
-@@ -5,13 +5,9 @@ FCOMMON_OPT += -marm -mfpu=vfpv3  -mfloa
- endif
- 
- ifeq ($(CORE), ARMV7)
--CCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard -march=armv7-a
--FCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard -march=armv7-a
+@@ -10,8 +10,8 @@ FCOMMON_OPT += -marm -mfpu=vfpv3  -mfloa
  endif
  
  ifeq ($(CORE), ARMV6)
 -CCOMMON_OPT += -marm -mfpu=vfp -mfloat-abi=hard  -march=armv6
 -FCOMMON_OPT += -marm -mfpu=vfp -mfloat-abi=hard  -march=armv6
++CCOMMON_OPT += -marm -mfpu=vfpv3-d16 -mfloat-abi=hard  -march=armv7-a
++FCOMMON_OPT += -marm -mfpu=vfpv3-d16 -mfloat-abi=hard  -march=armv7-a
  endif
  
  
diff --git a/debian/rules b/debian/rules
index 14665e5..07d9c58 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ endif
 # Also, it FTBFS if GCC flag -mvfpv3 is removed (see arm-gcc-flags.patch), because GCC
 # refuses asm files with 32 FP registers in that case.
 # Issue discussed in https://github.com/xianyi/OpenBLAS/issues/388
+# See also debian/patches/arm-gcc-flags.patch which is related.
 ifeq ($(DEB_HOST_ARCH),armhf)
 	GENERIC_OPTIONS += TARGET=ARMV6
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openblas.git