guix-commits
[Top][All Lists]
Advanced

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

23/30: Revert "gnu: gcc-boot: Update to 3.4.0."


From: Jan Nieuwenhuizen
Subject: 23/30: Revert "gnu: gcc-boot: Update to 3.4.0."
Date: Tue, 12 Jun 2018 13:20:53 -0400 (EDT)

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

commit 3554a0fe3f9697edb0e5a4a48644005fb2b24c29
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Sun Jun 10 20:07:55 2018 +0200

    Revert "gnu: gcc-boot: Update to 3.4.0."
    
    This reverts commit b8dc92280df74233bd85fc459311ff139355f0c4.
---
 gnu/local.mk                              |  2 +-
 gnu/packages/mes.scm                      |  8 +++---
 gnu/packages/patches/gcc-boot-3.2.patch   | 34 ++++++++++++++++++++++++
 gnu/packages/patches/gcc-boot-3.4.0.patch | 44 -------------------------------
 4 files changed, 39 insertions(+), 49 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 1b5ec9b..7d0118c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -643,7 +643,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-powerpc-missing-include.patch  \
-  %D%/packages/patches/gcc-boot-3.4.0.patch                    \
+  %D%/packages/patches/gcc-boot-3.2.patch                      \
   %D%/packages/patches/gcc-cross-environment-variables.patch   \
   %D%/packages/patches/gcc-libvtv-runpath.patch                        \
   %D%/packages/patches/gcc-strmov-store-file-names.patch       \
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index f7767f7..af33bc7 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -590,16 +590,16 @@ standard.")
   (package
     (inherit gcc)
     (name "gcc-boot")
-    (version "3.4.0")
+    (version "3.2")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://gnu/gcc/gcc-3.4.0/gcc-core-"
+              (uri (string-append "mirror://gnu/gcc/gcc-3.2/gcc-core-"
                                   version
                                   ".tar.gz"))
-              (patches (search-patches "gcc-boot-3.4.0.patch"))
+              (patches (search-patches "gcc-boot-3.2.patch"))
               (sha256
                (base32
-                "08c1y1yajmxia64pw7anr3hh7d368c1ncfj6prl38aq2z6srxr88"))))
+                "1pyik02gmi425d110m8j0gavp3lkqlg5rlh71hng12rha35dplsj"))))
     (supported-systems '("i686-linux"))
     (native-inputs `(("binutils" ,binutils-boot)
                      ("tcc" ,tcc-boot)))
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
diff --git a/gnu/packages/patches/gcc-boot-3.4.0.patch 
b/gnu/packages/patches/gcc-boot-3.4.0.patch
deleted file mode 100644
index bfbea3b..0000000
--- a/gnu/packages/patches/gcc-boot-3.4.0.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -purN -x config.status -x config.h -x BOOT ../gcc-3.4.0/gcc/Makefile.in 
gcc-3.4.0/gcc/Makefile.in
---- ../gcc-3.4.0/gcc/Makefile.in       2004-04-01 18:47:54.000000000 +0200
-+++ gcc-3.4.0/gcc/Makefile.in  2018-06-07 22:56:59.236461370 +0200
-@@ -353,8 +353,8 @@ CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_
- SYSTEM_HEADER_DIR = @SYSTEM_HEADER_DIR@
- 
- # 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.4.0/intl/config.intl 
gcc-3.4.0/intl/config.intl
---- ../gcc-3.4.0/intl/config.intl      1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.0/intl/config.intl 2018-06-06 20:46:03.857566469 +0200
-@@ -0,0 +1,12 @@
-+# This file records the configuration of libintl in a form that
-+# can be read back in by a configure script in a sister directory.
-+# See config/gettext.m4 for its use.
-+
-+USE_NLS='yes'
-+LIBINTL='${top_builddir}/intl/libintl.a '
-+LIBINTL_DEP='${top_builddir}/intl/libintl.a'
-+INCINTL='-I${top_builddir}/intl'
-+
-+XGETTEXT=':'
-+GMSGFMT=':'
-+POSUB='po'
-diff -purN -x config.status -x config.h -x BOOT ../gcc-3.4.0/intl/localename.c 
gcc-3.4.0/intl/localename.c
---- ../gcc-3.4.0/intl/localename.c     2003-07-04 20:18:54.000000000 +0200
-+++ gcc-3.4.0/intl/localename.c        2018-06-06 18:22:34.324535867 +0200
-@@ -26,6 +26,10 @@
- #include <stdlib.h>
- #include <locale.h>
- 
-+#ifndef NULL
-+#define NULL 0
-+#endif
-+
- #if defined _WIN32 || defined __WIN32__
- # undef WIN32   /* avoid warning on mingw32 */
- # define WIN32



reply via email to

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