From 3b79bdf4da6569d6652bd9904fcfac68ba1ab10e Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 12 Feb 2003 22:27:26 +0000 Subject: [PATCH] - removed obsolete gcc32-fold-const-associate and gcc32-bison_expect patches - updated info patch (gcc32-ada-link patch is not applied now) Changed files: gcc-info.patch -> 1.6 gcc.spec -> 1.138 gcc32-bison_expect.patch -> 1.2 gcc32-fold-const-associate.patch -> 1.2 --- gcc-info.patch | 21 ++++++------ gcc.spec | 8 ++--- gcc32-bison_expect.patch | 11 ------ gcc32-fold-const-associate.patch | 58 -------------------------------- 4 files changed, 12 insertions(+), 86 deletions(-) delete mode 100644 gcc32-bison_expect.patch delete mode 100644 gcc32-fold-const-associate.patch diff --git a/gcc-info.patch b/gcc-info.patch index 7df833f..8c9363e 100644 --- a/gcc-info.patch +++ b/gcc-info.patch @@ -74,32 +74,31 @@ In other *.texi we can use tabs. @macro syntax{element} --- gcc-3.2/gcc/ada/gnat_rm.texi.orig Fri Nov 1 22:58:52 2002 +++ gcc-3.2/gcc/ada/gnat_rm.texi Fri Nov 1 23:09:45 2002 -@@ -31,9 +31,9 @@ +@@ -31,6 +31,10 @@ @settitle GNAT Reference Manual @setchapternewpage odd @syncodeindex fn cp --@dircategory Programming +@dircategory Programming Languages: - @direntry --* gnat_rm: (gnat_rm). GNAT Reference Manual ++@direntry +* gnat_rm: (gnat_rm). GNAT Reference Manual - @end direntry ++@end direntry @titlepage + --- gcc-3.2/gcc/ada/gnat_ug.texi.orig Fri Nov 1 22:58:52 2002 +++ gcc-3.2/gcc/ada/gnat_ug.texi Fri Nov 1 23:10:20 2002 -@@ -75,9 +75,9 @@ +@@ -75,6 +75,11 @@ @syncodeindex fn cp @c %**end of header --@dircategory Programming +@dircategory Programming Languages: - @direntry --* gnat_ug: (gnat_ug). GNAT User's Guide ++@direntry +* gnat_ug: (gnat_ug). GNAT User's Guide - @end direntry - ++@end direntry ++ @titlepage + + @ifset vms --- gcc-3.2/gcc/f/g77.texi.orig Mon Apr 29 09:58:32 2002 +++ gcc-3.2/gcc/f/g77.texi Fri Nov 1 23:11:56 2002 @@ -90,9 +90,9 @@ diff --git a/gcc.spec b/gcc.spec index 1186c14..601be6c 100644 --- a/gcc.spec +++ b/gcc.spec @@ -47,7 +47,7 @@ Patch24: gcc32-duplicate-decl.patch Patch25: gcc32-dwarf2-pr6381.patch Patch26: gcc32-dwarf2-pr6436-test.patch Patch27: gcc32-fde-merge-compat.patch -Patch28: gcc32-fold-const-associate.patch + Patch29: gcc32-hard-reg-sharing.patch Patch30: gcc32-hard-reg-sharing2.patch Patch31: gcc32-i386-default-momit-leaf-frame-pointer.patch @@ -67,7 +67,6 @@ Patch44: gcc32-tls2.patch Patch45: gcc32-tls3.patch Patch46: gcc32-tls4.patch Patch47: gcc32-tls5.patch -Patch48: gcc32-bison_expect.patch BuildRequires: autoconf BuildRequires: bison BuildRequires: fileutils >= 4.0.41 @@ -525,7 +524,6 @@ mv ksi-%{KSI_VERSION} gcc/ksi %patch25 %patch26 %patch27 -#%patch28 %patch29 %patch30 %patch31 @@ -545,10 +543,8 @@ mv ksi-%{KSI_VERSION} gcc/ksi %patch45 %patch46 %patch47 -#%patch48 -# fixme -#%patch6 -p1 +%patch6 -p1 perl -p -i -e 's/";/ (PLD Linux)";/' gcc/version.c diff --git a/gcc32-bison_expect.patch b/gcc32-bison_expect.patch deleted file mode 100644 index d642fcf..0000000 --- a/gcc32-bison_expect.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gcc/c-parse.in~ Mon Feb 3 23:06:25 2003 -+++ gcc/c-parse.in Mon Feb 3 23:08:09 2003 -@@ -29,7 +29,7 @@ - written by AT&T, but I have never seen it. */ - - ifobjc --%expect 31 /* shift/reduce conflicts, and 1 reduce/reduce conflict. */ -+/* %expect 31 */ /* shift/reduce conflicts, and 1 reduce/reduce conflict. */ - end ifobjc - ifc - %expect 10 /* shift/reduce conflicts, and no reduce/reduce conflicts. */ diff --git a/gcc32-fold-const-associate.patch b/gcc32-fold-const-associate.patch deleted file mode 100644 index 90a9f2b..0000000 --- a/gcc32-fold-const-associate.patch +++ /dev/null @@ -1,58 +0,0 @@ -2002-08-05 Jakub Jelinek - - * fold-const.c (associate_trees): Only optimize NEGATE_EXPR in one - of the operands into MINUS_EXPR if code is PLUS_EXPR. - - * gcc.c-torture/execute/20020805-1.c: New test. - ---- gcc/testsuite/gcc.c-torture/execute/20020805-1.c.jj 2002-08-05 18:27:42.000000000 +0200 -+++ gcc/testsuite/gcc.c-torture/execute/20020805-1.c 2002-08-05 18:26:42.000000000 +0200 -@@ -0,0 +1,21 @@ -+/* This testcase was miscompiled on IA-32, because fold-const -+ assumed associate_trees is always done on PLUS_EXPR. */ -+ -+extern void abort (void); -+extern void exit (int); -+ -+void check (unsigned int m) -+{ -+ if (m != (unsigned int) -1) -+ abort (); -+} -+ -+unsigned int n = 1; -+ -+int main (void) -+{ -+ unsigned int m; -+ m = (1 | (2 - n)) | (-n); -+ check (m); -+ exit (0); -+} ---- gcc/fold-const.c.jj 2002-08-05 18:16:25.000000000 +0200 -+++ gcc/fold-const.c 2002-08-05 18:16:25.000000000 +0200 -@@ -1500,14 +1500,16 @@ associate_trees (t1, t2, code, type) - if (TREE_CODE (t1) == code || TREE_CODE (t2) == code - || TREE_CODE (t1) == MINUS_EXPR || TREE_CODE (t2) == MINUS_EXPR) - { -- if (TREE_CODE (t1) == NEGATE_EXPR) -- return build (MINUS_EXPR, type, convert (type, t2), -- convert (type, TREE_OPERAND (t1, 0))); -- else if (TREE_CODE (t2) == NEGATE_EXPR) -- return build (MINUS_EXPR, type, convert (type, t1), -- convert (type, TREE_OPERAND (t2, 0))); -- else -- return build (code, type, convert (type, t1), convert (type, t2)); -+ if (code == PLUS_EXPR) -+ { -+ if (TREE_CODE (t1) == NEGATE_EXPR) -+ return build (MINUS_EXPR, type, convert (type, t2), -+ convert (type, TREE_OPERAND (t1, 0))); -+ else if (TREE_CODE (t2) == NEGATE_EXPR) -+ return build (MINUS_EXPR, type, convert (type, t1), -+ convert (type, TREE_OPERAND (t2, 0))); -+ } -+ return build (code, type, convert (type, t1), convert (type, t2)); - } - - return fold (build (code, type, convert (type, t1), convert (type, t2))); -- 2.44.0