06/07: patch: wip

[Jan Nieuwenhuizen]

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 87cc73d87d91231f2cbe28a0c3fa24f6ecf254a1
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Tue Sep 18 10:13:37 2018 +0200

    patch: wip
---
 gnu/packages/commencement.scm                    | 11 ++---------
 gnu/packages/patches/binutils-boot-2.20.1a.patch | 21 ++++++++++++++++++++-
 gnu/packages/patches/gcc-boot-4.7.4.patch        | 12 +++++++++++-
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 0e777ee..3fb0a69 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1125,15 +1125,8 @@ ac_cv_c_float_format='IEEE (little-endian)'
      (inherit gcc-mesboot0)
      (name "gcc-mesboot1")
      (version "4.7.4")
-     (source (origin
-               (method url-fetch)
-               (uri (string-append "mirror://gnu/gcc/gcc-4.7.4/gcc-"
-                                   version
-                                   ".tar.gz"))
-               (patches (search-patches "gcc-boot-4.7.4.patch"))
-               (sha256
-                (base32
-                 "06bqygv17f71f7g7pi7ddvhljcr8dimrypgiif9g1r6lqn1sbfnx"))))
+     (source (origin (inherit (package-source gcc-4.7))
+                     (patches (search-patches "gcc-boot-4.7.4.patch"))))
      (inputs `(("gmp-source" ,(package-source gmp-boot))
                ("mpfr-source" ,(package-source mpfr-boot))
                ("mpc-source" ,(package-source mpc-boot))))
diff --git a/gnu/packages/patches/binutils-boot-2.20.1a.patch 
b/gnu/packages/patches/binutils-boot-2.20.1a.patch
index 490cbae..7e5762c 100644
--- a/gnu/packages/patches/binutils-boot-2.20.1a.patch
+++ b/gnu/packages/patches/binutils-boot-2.20.1a.patch
@@ -4,11 +4,30 @@ This patch enables building binutils using TCC and Mes C 
Library
   * remove signed int trickery that does not work with TCC
   * fixe the malloc prototype to use size_t
   * add missing includes
-  * remove a C99'ism of mixing code and variable declaration
+  * remove C99'isms to avoid of mixing code and variable declaration
   * [MES_BOOTSTRAP]: remove strncmp to avoid duplicat symbol
 
 Upstream status: Not presented upstream.
 
+diff -purN -x config.status -x config.h -x BOOT 
../binutils-2.20.1a/bfd/elf32-i386.c binutils-2.20.1a/bfd/elf32-i386.c
+--- ../binutils-2.20.1a/bfd/elf32-i386.c       2009-09-10 13:47:12.000000000 
+0200
++++ binutils-2.20.1a/bfd/elf32-i386.c  2018-06-23 19:33:20.068134411 +0200
+@@ -4254,6 +4254,7 @@ elf_i386_finish_dynamic_symbol (bfd *out
+             if (!h->pointer_equality_needed)
+               abort ();
+ 
++              {
+             /* For non-shared object, we can't use .got.plt, which
+                contains the real function addres if we need pointer
+                equality.  We load the GOT entry with the PLT entry.  */
+@@ -4262,6 +4263,7 @@ elf_i386_finish_dynamic_symbol (bfd *out
+                         (plt->output_section->vma
+                          + plt->output_offset + h->plt.offset),
+                         htab->elf.sgot->contents + h->got.offset);
++              }
+             return TRUE;
+           }
+       }
 diff -purN -x config.status -x config.h -x BOOT 
../binutils-2.20.1a/bfd/elfcode.h binutils-2.20.1a/bfd/elfcode.h
 --- ../binutils-2.20.1a/bfd/elfcode.h  2009-09-10 13:47:12.000000000 +0200
 +++ binutils-2.20.1a/bfd/elfcode.h     2018-06-19 19:07:16.647627075 +0200
diff --git a/gnu/packages/patches/gcc-boot-4.7.4.patch 
b/gnu/packages/patches/gcc-boot-4.7.4.patch
index 1f376b4..9aa9296 100644
--- a/gnu/packages/patches/gcc-boot-4.7.4.patch
+++ b/gnu/packages/patches/gcc-boot-4.7.4.patch
@@ -1,3 +1,13 @@
+This patch enables building gcc-4.7.4 using gcc-2.95.3 and glibc-2.2.5
+
+  * Tweak Makefile to allow overriding NATIVE_SYSTEM_HEADER_DIR using 
#:makeflags
+  * Add missing limits.h include.
+  * Add SSIZE_MAX define.  The SSIZE_MAX define has been added to Mes
+    upstream and can be removed with the next Mes release.
+  * Remove -fbuilding-libgcc flag, it assumes features being present from a
+    newer gcc or glibc.
+  * [MES_GCC_BOOTSTRAP]: Disable threads harder.
+
 diff --git a/gcc/Makefile.in b/gcc/Makefile.in
 index f3cc49fdb18..bc5718fc9a6 100644
 --- a/gcc/Makefile.in
@@ -50,7 +60,7 @@ index bbe6dd12b5a..1d1d48223d7 100644
     can build glibc.  */
  
 -#ifndef inhibit_libc
-+#if 0 // ndef inhibit_libc
++#if 0 // !defined (inhibit_libc) && !MES_GCC_BOOTSTRAP
  
  #include <errno.h>
  #include <pthread.h>