diff mbox

[1/3] gnu: Add arm-none-eabi cross compiler.

Message ID 20160918063513.11027-2-rekado@elephly.net
State New
Headers show

Commit Message

Ricardo Wurmus Sept. 18, 2016, 6:35 a.m. UTC
* gnu/packages/bootstrap.scm (glibc-dynamic-linker): Add case for "arm-eabi".
* gnu/packages/embedded.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
---
 gnu/local.mk               |   1 +
 gnu/packages/bootstrap.scm |   1 +
 gnu/packages/embedded.scm  | 121 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 123 insertions(+)
 create mode 100644 gnu/packages/embedded.scm

Comments

Ludovic Courtès Sept. 21, 2016, 8:34 a.m. UTC | #1
Hi!

Ricardo Wurmus <rekado@elephly.net> skribis:

> * gnu/packages/bootstrap.scm (glibc-dynamic-linker): Add case for "arm-eabi".
> * gnu/packages/embedded.scm: New file.
> * gnu/local.mk (GNU_SYSTEM_MODULES): Add it.

[...]

> +;; Commit hashes and SVN revisions for xbinutils and xgcc are taken
> +;; from https://launchpadlibrarian.net/209776344/release.txt
> +
> +(define-public xbinutils-arm-none-eabi

[...]

> +      (arguments
> +       `(,@(substitute-keyword-arguments (package-arguments parent)
> +             ((#:configure-flags flags)
> +              `(cons "--enable-multilib"
> +                     (delete "--disable-multilib" ,flags)))))))))

Why is multilib support needed?  Could you add a comment here?

Also, `,@lst is equivalent to lst.  :-)

> +       `(,@(substitute-keyword-arguments (package-arguments xgcc)
            ^^
Same here.

> +             ((#:configure-flags flags)
> +              `(append (list "--enable-multilib"
> +                             "--with-newlib"
> +                             "--with-multilib-list=armv6-m,armv7-m,armv7e-m"
> +                             "--with-host-libstdcxx=-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm"
> +                             "--enable-plugins"
> +                             "--disable-decimal-float"
> +                             "--disable-libffi"
> +                             "--disable-libgomp"
> +                             "--disable-libmudflap"
> +                             "--disable-libquadmath"
> +                             "--disable-libssp"
> +                             "--disable-libstdcxx-pch"
> +                             "--disable-nls"
> +                             "--disable-shared"
> +                             "--disable-threads"
> +                             "--disable-tls"
> +                             "--with-gnu-as"
> +                             "--with-gnu-ld")
> +                       (delete "--disable-multilib" ,flags)))))))))

Could you add comments explaining briefly where these flags come from?
Normally --with-gnu-* are not needed because ./configure should detect
that.

Thank you,
Ludo’.
diff mbox

Patch

diff --git a/gnu/local.mk b/gnu/local.mk
index e2cf40d..ce5faca 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -110,6 +110,7 @@  GNU_SYSTEM_MODULES =				\
   %D%/packages/education.scm			\
   %D%/packages/elf.scm				\
   %D%/packages/elixir.scm			\
+  %D%/packages/embedded.scm			\
   %D%/packages/emacs.scm			\
   %D%/packages/enchant.scm			\
   %D%/packages/engineering.scm			\
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index f47a343..f6faba3 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -171,6 +171,7 @@  successful, or false to signal an error."
 
         ;; XXX: This one is used bare-bones, without a libc, so add a case
         ;; here just so we can keep going.
+        ((string=? system "arm-eabi") "no-ld.so")
         ((string=? system "xtensa-elf") "no-ld.so")
         ((string=? system "avr") "no-ld.so")
         ((string=? system "i686-mingw") "no-ld.so")
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
new file mode 100644
index 0000000..17ca784
--- /dev/null
+++ b/gnu/packages/embedded.scm
@@ -0,0 +1,121 @@ 
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages embedded)
+  #:use-module (guix utils)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix svn-download)
+  #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages cross-base)
+  #:use-module (gnu packages flex)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages texinfo))
+
+;; Commit hashes and SVN revisions for xbinutils and xgcc are taken
+;; from https://launchpadlibrarian.net/209776344/release.txt
+
+(define-public xbinutils-arm-none-eabi
+  (let ((parent (cross-binutils "arm-none-eabi"))
+        (commit "136a940ac535e464d2a7a86880ce1f1a5554c484")
+        (revision "1"))
+    (package (inherit parent)
+      (version (string-append (package-version parent) "-"
+                              revision "." (string-take commit 9)))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "git://sourceware.org/git/binutils-gdb.git")
+                      (commit commit)))
+                (file-name (string-append "xbinutils-arm-none-eabi-"
+                                          version "-checkout"))
+                (patches (origin-patches (package-source parent)))
+                (sha256
+                 (base32
+                  "185sfmhbplidvj8n3h1clqqf6c0wqcigzm3phn9sqfy9arsv3mg8"))))
+      (native-inputs
+       `(("texinfo" ,texinfo)
+         ("perl" ,perl)
+         ("bison" ,bison)
+         ("flex" ,flex)
+         ,@(package-native-inputs parent)))
+      (arguments
+       `(,@(substitute-keyword-arguments (package-arguments parent)
+             ((#:configure-flags flags)
+              `(cons "--enable-multilib"
+                     (delete "--disable-multilib" ,flags)))))))))
+
+;; We must not use the released GCC sources here, because the cross-compiler
+;; does not produce working binaries.  Instead we take the very same SVN
+;; revision from the branch that is used for a release of the "GCC ARM
+;; embedded" project on launchpad.
+(define-public gcc-arm-none-eabi
+  (let ((xgcc (cross-gcc "arm-none-eabi"
+                         xbinutils-arm-none-eabi))
+        (revision "1")
+        (svn-revision 224288))
+    (package (inherit xgcc)
+      (version (string-append (package-version xgcc) "-"
+                              revision "." (number->string svn-revision)))
+      (source
+       (origin
+         (method svn-fetch)
+         (uri (svn-reference
+               (url "svn://gcc.gnu.org/svn/gcc/branches/ARM/embedded-4_9-branch/")
+               (revision svn-revision)))
+         (file-name (string-append "gcc-arm-embedded-" version "-checkout"))
+         (sha256
+          (base32
+           "113r98kygy8rrjfv2pd3z6zlfzbj543pq7xyq8bgh72c608mmsbr"))
+         (patches (origin-patches (package-source xgcc)))))
+      (native-inputs
+       `(("flex" ,flex)
+         ,@(package-native-inputs xgcc)))
+      (arguments
+       `(,@(substitute-keyword-arguments (package-arguments xgcc)
+             ((#:phases phases)
+              `(modify-phases ,phases
+                 (add-after 'unpack 'fix-genmultilib
+                   (lambda _
+                     (substitute* "gcc/genmultilib"
+                       (("#!/bin/sh") (string-append "#!" (which "sh"))))
+                     #t))))
+             ((#:configure-flags flags)
+              `(append (list "--enable-multilib"
+                             "--with-newlib"
+                             "--with-multilib-list=armv6-m,armv7-m,armv7e-m"
+                             "--with-host-libstdcxx=-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm"
+                             "--enable-plugins"
+                             "--disable-decimal-float"
+                             "--disable-libffi"
+                             "--disable-libgomp"
+                             "--disable-libmudflap"
+                             "--disable-libquadmath"
+                             "--disable-libssp"
+                             "--disable-libstdcxx-pch"
+                             "--disable-nls"
+                             "--disable-shared"
+                             "--disable-threads"
+                             "--disable-tls"
+                             "--with-gnu-as"
+                             "--with-gnu-ld")
+                       (delete "--disable-multilib" ,flags)))))))))