guix-commits
[Top][All Lists]
Advanced

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

73/207: gnu: gcc-boot: Update to 3.2.


From: Jan Nieuwenhuizen
Subject: 73/207: gnu: gcc-boot: Update to 3.2.
Date: Sat, 8 Sep 2018 13:26:07 -0400 (EDT)

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

commit 4091fd09ca403bf2c45168e3324ec57ac53dcb0e
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Sun Jun 10 11:04:12 2018 +0200

    gnu: gcc-boot: Update to 3.2.
    
    * gnu/packages/mes.scm (gcc-boot): Update to 3.2.
    * gnu/packages/patches (gcc-boot-3.2.patch): New file.
    * gnu/packages/patches (gcc-boot-3.0): Remove.
    * gnu/local.mk (dist_patch_DATA): Rename it.
---
 gnu/local.mk                            |  2 +-
 gnu/packages/mes.scm                    | 12 +++++------
 gnu/packages/patches/gcc-boot-3.0.patch | 37 ---------------------------------
 gnu/packages/patches/gcc-boot-3.2.patch | 34 ++++++++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 44 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 18ed844..ed50249 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -696,7 +696,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/gcc-arm-bug-71399.patch                 \
   %D%/packages/patches/gcc-arm-link-spec-fix.patch             \
   %D%/packages/patches/gcc-asan-missing-include.patch          \
-  %D%/packages/patches/gcc-boot-3.0.patch                      \
+  %D%/packages/patches/gcc-boot-3.2.patch                      \
   %D%/packages/patches/gcc-cross-environment-variables.patch   \
   %D%/packages/patches/gcc-fix-texi2pod.patch                  \
   %D%/packages/patches/gcc-4.8-libsanitizer-fix.patch          \
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 6c95ad8..fde5431 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -595,16 +595,16 @@ standard.")
   (package
     (inherit gcc)
     (name "gcc-boot")
-    (version "3.0")
+    (version "3.2")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://gnu/gcc/gcc-3.0/gcc-core-"
+              (uri (string-append "mirror://gnu/gcc/gcc-3.2/gcc-core-"
                                   version
                                   ".tar.gz"))
-              (patches (search-patches "gcc-boot-3.0.patch"))
+              (patches (search-patches "gcc-boot-3.2.patch"))
               (sha256
                (base32
-                "13x04j77h9jw7g74v41s7jvxb2n3nx0mdvg8cf3i2bm306mss5vk"))))
+                "1pyik02gmi425d110m8j0gavp3lkqlg5rlh71hng12rha35dplsj"))))
     (supported-systems '("i686-linux"))
     (native-inputs `(("binutils" ,binutils-boot)
                      ("tcc" ,tcc-boot)))
@@ -659,8 +659,8 @@ ac_cv_c_float_format='IEEE (little-endian)'
          (replace 'build
            (lambda* (#:key make-flags #:allow-other-keys)
              (let ((tcc-boot (assoc-ref %build-inputs "tcc")))
-               ;; (system* "ar" "r" "libg.a"
-               ;;          (string-append tcc-boot "/lib/x86-mes-gcc/libg.o"))
+               (system* "ar" "r" "libg.a"
+                        (string-append tcc-boot "/lib/x86-mes-gcc/libg.o"))
                (and (zero? (apply system* (cons "make" make-flags)))
                     ;; (system* "make" "stage1" "LANGUAGES=c")
                     ;; (zero? (system* "make" "CC=stage1/xgcc -Bstage1/"
diff --git a/gnu/packages/patches/gcc-boot-3.0.patch 
b/gnu/packages/patches/gcc-boot-3.0.patch
deleted file mode 100644
index 868ed82..0000000
--- a/gnu/packages/patches/gcc-boot-3.0.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -purN -x config.status -x config.h -x BOOT ../gcc-3.0/gcc/config.gcc 
gcc-3.0/gcc/config.gcc
---- ../gcc-3.0/gcc/config.gcc  2001-06-05 21:09:51.000000000 +0200
-+++ gcc-3.0/gcc/config.gcc     2018-06-07 23:08:25.167767955 +0200
-@@ -1210,6 +1210,7 @@ i[34567]86-*-linux*)     # Intel 80386's run
-       tm_file="i386/i386.h i386/att.h linux.h i386/linux.h"
-       tmake_file="t-slibgcc-elf-ver t-linux i386/t-crtstuff"
-       extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+      extra_parts=""
-       gnu_ld=yes
-       float_format=i386
-       if test x$enable_threads = xyes; then
-diff -purN -x config.status -x config.h -x BOOT ../gcc-3.0/gcc/Makefile.in 
gcc-3.0/gcc/Makefile.in
---- ../gcc-3.0/gcc/Makefile.in 2001-06-13 07:05:35.000000000 +0200
-+++ gcc-3.0/gcc/Makefile.in    2018-06-07 17:14:44.405516220 +0200
-@@ -263,8 +263,8 @@ SPLAY_TREE_H= $(srcdir)/../include/splay
- CROSS_SYSTEM_HEADER_DIR = $(tooldir)/sys-include
- 
- # Control whether to run fixproto and fixincludes.
--STMP_FIXPROTO = stmp-fixproto
--STMP_FIXINC = stmp-fixinc
-+STMP_FIXPROTO = #stmp-fixproto
-+STMP_FIXINC = # stmp-fixinc
- 
- # Test to see whether <limits.h> exists in the system header files.
- LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h ]
-diff -purN -x config.status -x config.h -x BOOT ../gcc-3.0/gcc/timevar.c 
gcc-3.0/gcc/timevar.c
---- ../gcc-3.0/gcc/timevar.c   2001-03-02 20:51:59.000000000 +0100
-+++ gcc-3.0/gcc/timevar.c      2018-06-07 10:39:37.795395232 +0200
-@@ -27,6 +27,8 @@
- # include <sys/times.h>
- #endif
- 
-+#include <sys/resource.h>
-+
- #ifdef HAVE_SYS_RESOURCE_H
- #include <sys/resource.h>
- #endif
diff --git a/gnu/packages/patches/gcc-boot-3.2.patch 
b/gnu/packages/patches/gcc-boot-3.2.patch
new file mode 100644
index 0000000..2533c8b
--- /dev/null
+++ b/gnu/packages/patches/gcc-boot-3.2.patch
@@ -0,0 +1,34 @@
+diff -purN -x config.status -x config.h -x BOOT 
../gcc-3.2/gcc/config/i386/i386.c gcc-3.2/gcc/config/i386/i386.c
+--- ../gcc-3.2/gcc/config/i386/i386.c  2002-08-07 20:10:57.000000000 +0200
++++ gcc-3.2/gcc/config/i386/i386.c     2018-06-06 15:39:23.235166230 +0200
+@@ -721,7 +721,9 @@ static int ix86_fp_comparison_cost PARAM
+ static int ix86_save_reg PARAMS ((int, int));
+ static void ix86_compute_frame_layout PARAMS ((struct ix86_frame *));
+ static int ix86_comp_type_attributes PARAMS ((tree, tree));
++#if 0
+ const struct attribute_spec ix86_attribute_table[];
++#endif
+ static tree ix86_handle_cdecl_attribute PARAMS ((tree *, tree, tree, int, 
bool *));
+ static tree ix86_handle_regparm_attribute PARAMS ((tree *, tree, tree, int, 
bool *));
+ 
+@@ -820,7 +822,7 @@ static enum x86_64_reg_class merge_class
+ #undef TARGET_SCHED_REORDER
+ #define TARGET_SCHED_REORDER ix86_sched_reorder
+ 
+-struct gcc_target targetm = TARGET_INITIALIZER;
++struct gcc_target targetm = {0};
+ 
+ /* Sometimes certain combinations of command options do not make
+    sense on a particular target machine.  You can define a macro
+diff -purN -x config.status -x config.h -x BOOT ../gcc-3.2/gcc/configure 
gcc-3.2/gcc/configure
+--- ../gcc-3.2/gcc/configure   2002-06-29 02:20:11.000000000 +0200
++++ gcc-3.2/gcc/configure      2018-06-06 15:14:04.134194009 +0200
+@@ -3005,7 +3005,7 @@ if { (eval echo configure:2991: \"$ac_co
+   elif grep 'format:address@hidden:tamrof' conftest.dmp >/dev/null 2>&1; then
+     ac_cv_c_float_format='IEEE (little-endian)'
+   elif grep 'format:.EFP@@I.:tamrof' conftest.dmp >/dev/null 2>&1; then
+-    ac_cv_c_float_format='IEEE (little-endian)'
++    ac_cv_c_float_format=o'IEEE (little-endian)'
+   elif grep 'format:.__floa.:tamrof' conftest.dmp >/dev/null 2>&1; then
+     ac_cv_c_float_format='VAX D-float'
+   elif grep 'format:..PDP-1.:tamrof' conftest.dmp >/dev/null 2>&1; then



reply via email to

[Prev in Thread] Current Thread [Next in Thread]