01/01: Revert "gnu: openssl: Remove workaround for GCC 4.9.3 (no longer used)."

[Mark H. Weaver]

mhw pushed a commit to branch core-updates
in repository guix.

commit 8af5cac527eee03005f3809578a0d8258a878f95
Author: Mark H Weaver <address@hidden>
Date:   Fri Jun 10 16:52:50 2016 -0400

    Revert "gnu: openssl: Remove workaround for GCC 4.9.3 (no longer used)."
    
    This reverts commit 12b6f6527e49c8c4191929a72b1692dbd9eb2440.
---
 gnu/packages/tls.scm |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 8895fd7..45c37f7 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -237,7 +237,15 @@ required structures.")
                        (string-append "--openssldir=" out
                                       "/share/openssl-" ,version)
 
-                       (string-append "--prefix=" out))))))
+                       (string-append "--prefix=" out)
+
+                       ;; XXX FIXME: Work around a code generation bug in GCC
+                       ;; 4.9.3 on ARM when compiled with -mfpu=neon.  See:
+                       ;; <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66917>
+                       ,@(if (and (not (%current-target-system))
+                                  (string-prefix? "armhf" (%current-system)))
+                             '("-mfpu=vfpv3")
+                             '()))))))
         (add-after
          'install 'make-libraries-writable
          (lambda* (#:key outputs #:allow-other-keys)