04/07: patch

guix-commits

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/07: patch

From:	Jan Nieuwenhuizen
Subject:	04/07: patch
Date:	Tue, 18 Sep 2018 04:56:43 -0400 (EDT)

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

commit 1f816552f05cc130334287329be09751c3729741
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Tue Sep 18 07:36:05 2018 +0200

    patch
---
 gnu/packages/commencement.scm                    |   6 +-
 gnu/packages/patches/binutils-boot-2.20.1a.patch |   2 +-
 gnu/packages/patches/gcc-boot-2.95.3.patch       | 147 +----------------------
 3 files changed, 5 insertions(+), 150 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 4bc190e..57a0879 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -743,9 +743,9 @@
             "--host=i686-unknown-linux-gnu"
             ,(string-append "--prefix=" out)))
         #:make-flags (list
-                      "CC=tcc -static -D __GLIBC_MINOR__=6 -D MES_BOOTSTRAP=1"
-                      "OLDCC=tcc -static -D __GLIBC_MINOR__=6 -D 
MES_BOOTSTRAP=1"
-                      "CC_FOR_BUILD=tcc -static -D __GLIBC_MINOR__=6 -D 
MES_BOOTSTRAP=1"
+                      "CC=tcc -static -D __GLIBC_MINOR__=6"
+                      "OLDCC=tcc -static -D __GLIBC_MINOR__=6"
+                      "CC_FOR_BUILD=tcc -static -D __GLIBC_MINOR__=6"
                       "AR=ar"
                       "RANLIB=ranlib"
                       (string-append "LIBGCC2_INCLUDES=-I "
diff --git a/gnu/packages/patches/binutils-boot-2.20.1a.patch 
b/gnu/packages/patches/binutils-boot-2.20.1a.patch
index 0740a00..490cbae 100644
--- a/gnu/packages/patches/binutils-boot-2.20.1a.patch
+++ b/gnu/packages/patches/binutils-boot-2.20.1a.patch
@@ -7,7 +7,7 @@ This patch enables building binutils using TCC and Mes C Library
   * remove a C99'ism of mixing code and variable declaration
   * [MES_BOOTSTRAP]: remove strncmp to avoid duplicat symbol
 
-Upstream status: Not presented to upstream.
+Upstream status: Not presented upstream.
 
 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
diff --git a/gnu/packages/patches/gcc-boot-2.95.3.patch 
b/gnu/packages/patches/gcc-boot-2.95.3.patch
index aa94eba..fd167ae 100644
--- a/gnu/packages/patches/gcc-boot-2.95.3.patch
+++ b/gnu/packages/patches/gcc-boot-2.95.3.patch
@@ -3,157 +3,12 @@ This patch enables building gcc-2.95.3 using TCC and Mes C 
Library.
   * Disable building DOC
   * Avoid running `fixproto'.
   * Force running `fixinc'.
-  * Add missing defines: FIRST_PSEUDO_REGISTER, PROTO
-  * Add mysteriously missing declarations in libgcc2.c
-  * Disable usage of "fflush (); exit ()", that breaks with Mes C Library.
   * Replace Makefile trickery of creating an libgcc1.a archive, then
     extracting the .o files later to create a new libgcc2.a archive.
     Instead, keep temporary .o files.
 
-Upstream status: Not presented to upstream.
+Upstream status: Not presented upstream.
 
-diff -purN -x foo.c -x BOOT -x BOOT-2 -x BOOT-strict -x .git -x Makefile -x 
config.status -x config.h -x BOOT -x BOOT-GCC ../gcc-2.95.3/gcc/crtstuff.c 
gcc-2.95.3/gcc/crtstuff.c
---- ../gcc-2.95.3/gcc/crtstuff.c       1999-03-23 01:43:51.000000000 +0100
-+++ gcc-2.95.3/gcc/crtstuff.c  2018-06-19 19:52:06.151175995 +0200
-@@ -54,8 +54,12 @@ Boston, MA 02111-1307, USA.  */
- #include "tm.h"
- #include "defaults.h"
- #include <stddef.h>
-+
-+#define FIRST_PSEUDO_REGISTER 17
-+
- #include "frame.h"
- 
-+
- /* We do not want to add the weak attribute to the declarations of these
-    routines in frame.h because that will cause the definition of these
-    symbols to be weak as well.
-diff -purN -x foo.c -x BOOT -x BOOT-2 -x BOOT-strict -x .git -x Makefile -x 
config.status -x config.h -x BOOT -x BOOT-GCC ../gcc-2.95.3/gcc/genattr.c 
gcc-2.95.3/gcc/genattr.c
---- ../gcc-2.95.3/gcc/genattr.c        1999-04-16 21:52:20.000000000 +0200
-+++ gcc-2.95.3/gcc/genattr.c   2018-06-23 11:56:48.291382356 +0200
-@@ -439,8 +439,12 @@ from the machine description file `md'.
-   printf("#define ATTR_FLAG_unlikely\t0x10\n");
-   printf("#define ATTR_FLAG_very_unlikely\t0x20\n");
- 
-+#if !MES_BOOTSTRAP
-   fflush (stdout);
-   exit (ferror (stdout) != 0 ? FATAL_EXIT_CODE : SUCCESS_EXIT_CODE);
-+#else
-+  puts ("");
-+#endif
-   /* NOTREACHED */
-   return 0;
- }
-diff -purN -x foo.c -x BOOT -x BOOT-2 -x BOOT-strict -x .git -x Makefile -x 
config.status -x config.h -x BOOT -x BOOT-GCC ../gcc-2.95.3/gcc/gencodes.c 
gcc-2.95.3/gcc/gencodes.c
---- ../gcc-2.95.3/gcc/gencodes.c       1999-04-16 21:52:23.000000000 +0200
-+++ gcc-2.95.3/gcc/gencodes.c  2018-06-23 12:01:29.899854058 +0200
-@@ -171,8 +171,12 @@ from the machine description file `md'.
- 
-   printf ("#endif /* MAX_INSN_CODE */\n");
- 
-+#if !MES_BOOTSTRAP
-   fflush (stdout);
-   exit (ferror (stdout) != 0 ? FATAL_EXIT_CODE : SUCCESS_EXIT_CODE);
-+#else
-+  puts ("");
-+#endif
-   /* NOTREACHED */
-   return 0;
- }
-diff -purN -x foo.c -x BOOT -x BOOT-2 -x BOOT-strict -x .git -x Makefile -x 
config.status -x config.h -x BOOT -x BOOT-GCC ../gcc-2.95.3/gcc/genconfig.c 
gcc-2.95.3/gcc/genconfig.c
---- ../gcc-2.95.3/gcc/genconfig.c      1999-04-16 21:52:24.000000000 +0200
-+++ gcc-2.95.3/gcc/genconfig.c 2018-06-23 12:12:28.434253092 +0200
-@@ -372,8 +372,12 @@ from the machine description file `md'.
-   if (have_lo_sum_flag)
-     printf ("#define HAVE_lo_sum\n");
- 
-+#if !MES_BOOTSTRAP
-   fflush (stdout);
-   exit (ferror (stdout) != 0 ? FATAL_EXIT_CODE : SUCCESS_EXIT_CODE);
-+#else
-+  puts ("");
-+#endif
-   /* NOTREACHED */
-   return 0;
- }
-diff -purN -x foo.c -x BOOT -x BOOT-2 -x BOOT-strict -x .git -x Makefile -x 
config.status -x config.h -x BOOT -x BOOT-GCC ../gcc-2.95.3/gcc/genflags.c 
gcc-2.95.3/gcc/genflags.c
---- ../gcc-2.95.3/gcc/genflags.c       1999-04-16 21:52:29.000000000 +0200
-+++ gcc-2.95.3/gcc/genflags.c  2018-06-23 12:14:44.576400818 +0200
-@@ -308,8 +308,12 @@ from the machine description file `md'.
- 
-   printf ("#endif  /* NO_MD_PROTOTYPES */\n");
- 
-+#if !MES_BOOTSTRAP
-   fflush (stdout);
-   exit (ferror (stdout) != 0 ? FATAL_EXIT_CODE : SUCCESS_EXIT_CODE);
-+#else
-+  puts ("");
-+#endif
-   /* NOTREACHED */
-   return 0;
- }
-diff -purN -x foo.c -x BOOT -x BOOT-2 -x BOOT-strict -x .git -x Makefile -x 
config.status -x config.h -x BOOT -x BOOT-GCC ../gcc-2.95.3/gcc/libgcc2.c 
gcc-2.95.3/gcc/libgcc2.c
---- ../gcc-2.95.3/gcc/libgcc2.c        1999-06-11 05:11:43.000000000 +0200
-+++ gcc-2.95.3/gcc/libgcc2.c   2018-06-19 19:52:06.151175995 +0200
-@@ -48,6 +48,45 @@ Boston, MA 02111-1307, USA.  */
- #include <stddef.h>
- #endif
- 
-+#if 0
-+/*
-+  mysteriously missing decls
-+*/
-+
-+#ifndef stderr
-+#define stderr 2
-+#endif
-+
-+#ifndef BITS_PER_UNIT
-+#define BITS_PER_UNIT 8
-+#endif
-+
-+#ifndef LONG_MIN
-+#define LONG_MIN -2147483648
-+#endif
-+
-+#ifndef EOF
-+#define EOF -1
-+#endif
-+
-+#if __GNUC__
-+// typedef unsigned short word_type;
-+
-+#if !defined (SIZE_T) && !defined (_SIZE_T) && !defined (__MES_SIZE_T)
-+#define SIZE_T
-+#define _SIZE_T
-+typedef long unsigned int size_t;
-+#endif
-+
-+#endif // __GNUC__
-+
-+#if !defined (_FILE_T) && !defined (__MES_FILE_T)
-+#define FILE_T
-+#define _FILE_T
-+typedef int *FILE;
-+#endif
-+
-+#endif // mystery
- /* Don't use `fancy_abort' here even if config.h says to use it.  */
- #ifdef abort
- #undef abort
-diff -purN -x foo.c -x BOOT -x BOOT-2 -x BOOT-strict -x .git -x Makefile -x 
config.status -x config.h -x BOOT -x BOOT-GCC ../gcc-2.95.3/gcc/machmode.h 
gcc-2.95.3/gcc/machmode.h
---- ../gcc-2.95.3/gcc/machmode.h       1999-04-08 09:27:26.000000000 +0200
-+++ gcc-2.95.3/gcc/machmode.h  2018-06-19 19:52:06.151175995 +0200
-@@ -21,6 +21,9 @@ Boston, MA 02111-1307, USA.  */
- #ifndef HAVE_MACHINE_MODES
- #define HAVE_MACHINE_MODES
- 
-+#undef PROTO
-+#define PROTO(args) args
-+
- /* Strictly speaking, this isn't the proper place to include these 
definitions,
-    but this file is included by every GCC file. */
- 
 diff -purN -x foo.c -x BOOT -x BOOT-2 -x BOOT-strict -x .git -x Makefile -x 
config.status -x config.h -x BOOT -x BOOT-GCC ../gcc-2.95.3/gcc/Makefile.in 
gcc-2.95.3/gcc/Makefile.in
 --- ../gcc-2.95.3/gcc/Makefile.in      2001-01-25 15:02:58.000000000 +0100
 +++ gcc-2.95.3/gcc/Makefile.in 2018-06-23 11:46:03.525159181 +0200

[Prev in Thread]

Current Thread

[Next in Thread]

branch wip-bootstrap updated (2e0ae3f -> ac4c0b1), Jan Nieuwenhuizen, 2018/09/18
- 01/07: patch: doc, Jan Nieuwenhuizen, 2018/09/18
- 02/07: patch doc, Jan Nieuwenhuizen, 2018/09/18
- 05/07: bootstrap: tcc update WIP, Jan Nieuwenhuizen, 2018/09/18
- 03/07: bootstrap: cleanup, document patches WIP, Jan Nieuwenhuizen, 2018/09/18
- 04/07: patch, Jan Nieuwenhuizen <=
- 07/07: patch: WIP., Jan Nieuwenhuizen, 2018/09/18
- 06/07: patch: wip, Jan Nieuwenhuizen, 2018/09/18

Prev by Date: 03/07: bootstrap: cleanup, document patches WIP
Next by Date: 07/07: patch: WIP.
Previous by thread: 03/07: bootstrap: cleanup, document patches WIP
Next by thread: 07/07: patch: WIP.
Index(es):
- Date
- Thread