02/02: gnu: linux-libre: Add retpoline support on x86 [mitigates spectre].

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit dbe64d1029f21ac085fa0d6dc88f8e4896016f18
Author: Mark H Weaver <address@hidden>
Date:   Thu Jan 25 14:13:57 2018 -0500

    gnu: linux-libre: Add retpoline support on x86 [mitigates spectre].
    
    * gnu/packages/linux.scm (make-linux-libre): On x86 systems, build
    with GCC-7.
---
 gnu/packages/linux.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 82f0776..ee7f391 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -283,6 +283,14 @@ for ARCH and optionally VARIANT, or #f if there is no such 
configuration."
        ("bc" ,bc)
        ("openssl" ,openssl)
        ("kmod" ,kmod)
+       ;; On x86, build with GCC-7 for full retpoline support.
+       ;; FIXME: Remove this when our default compiler has retpoline support.
+       ,@(match (system->linux-architecture
+                 (or (%current-target-system) (%current-system)))
+           ((or "x86_64" "i386")
+            `(("gcc" ,gcc-7)))
+           (_
+            '()))
        ,@(match (and configuration-file
                      (configuration-file
                       (system->linux-architecture