diff options
author | Ludovic Courtès <ludo@gnu.org> | 2022-05-26 17:11:20 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2022-05-26 17:11:20 +0200 |
commit | 7097e98586df3110b80943a88c27804d65f214fa (patch) | |
tree | 2e244b9fc19acc569d6abd42306aaf013f02da0d /gnu/packages/gcc.scm | |
parent | 15870cc08d20501e3526fa892111a43ae9e3e02f (diff) | |
parent | 4577f3c6b60ea100e521c246fb169d6c05214b20 (diff) |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/gcc.scm')
-rw-r--r-- | gnu/packages/gcc.scm | 39 |
1 files changed, 37 insertions, 2 deletions
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 43519f45f2..6823b41ee0 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -583,6 +583,20 @@ Go. It also includes runtime support libraries for these languages.") "znver2" "znver3"))) +(define %gcc-11-aarch64-micro-architectures + ;; Suitable '-march' values for GCC 11. + %gcc-10-aarch64-micro-architectures) ;unchanged + +(define %gcc-11-armhf-micro-architectures + %gcc-10-armhf-micro-architectures) + +(define %gcc-11-x86_64-micro-architectures + ;; Suitable '-march' values for GCC 11. + (append %gcc-10-x86_64-micro-architectures + '("sapphirerapids" "alterlake" "rocketlake" ;Intel + + "btver1" "btver2"))) ;AMD + (define-public gcc-7 (package (inherit gcc-6) @@ -678,8 +692,29 @@ It also includes runtime support libraries for these languages.") (modules '((guix build utils))) (snippet gcc-canadian-cross-objdump-snippet))) - ;; TODO: Add newly supported micro-architectures. - (properties (package-properties gcc-10)))) + (properties + `((compiler-cpu-architectures + ("aarch64" ,@%gcc-11-aarch64-micro-architectures) + ("armhf" ,@%gcc-11-armhf-micro-architectures) + ("x86_64" ,@%gcc-11-x86_64-micro-architectures)))))) + +(define-public gcc-12 + (package + (inherit gcc-11) + ;; Note: 'compiler-cpu-architectures' is unchanged compared to GCC 11. + (version "12.1.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gcc/gcc-" + version "/gcc-" version ".tar.xz")) + (sha256 + (base32 + "0ywws66myjxcwsmla721g35d2ymlckq6ii7j9av0477ki5467zb2")) + (patches (search-patches "gcc-12-strmov-store-file-names.patch" + "gcc-5.0-libvtv-runpath.patch")) + (modules '((guix build utils))) + (snippet gcc-canadian-cross-objdump-snippet))))) + ;; Note: When changing the default gcc version, update ;; the gcc-toolchain-* definitions. |