4.3.0-0.7
This commit is contained in:
Jakub Jelinek
parent
11c26b9220
commit
f659baaab5
@ -1,2 +1,2 @@
|
||||
gcc-4.3.0-20080126.tar.bz2
|
||||
gcc-4.3.0-20080130.tar.bz2
|
||||
fastjar-0.95.tar.gz
|
||||
|
||||
@ -1,135 +0,0 @@
|
||||
2008-01-25 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
PR c++/34965
|
||||
* c-pretty-print.c (pp_c_exclusive_or_expression): Handle
|
||||
TRUTH_XOR_EXPR.
|
||||
(pp_c_logical_and_expression): Handle TRUTH_AND_EXPR.
|
||||
(pp_c_logical_or_expression): Handle TRUTH_OR_EXPR.
|
||||
(pp_c_expression): Handle TRUTH_AND_EXPR, TRUTH_OR_EXPR
|
||||
and TRUTH_XOR_EXPR.
|
||||
|
||||
* error.c (dump_expr): Handle TRUTH_AND_EXPR, TRUTH_OR_EXPR
|
||||
and TRUTH_XOR_EXPR.
|
||||
|
||||
* gcc.dg/pr34965.c: New test.
|
||||
* g++.dg/other/error24.C: New test.
|
||||
|
||||
--- gcc/c-pretty-print.c.jj 2007-08-28 11:38:37.000000000 +0200
|
||||
+++ gcc/c-pretty-print.c 2008-01-25 17:41:06.000000000 +0100
|
||||
@@ -1,5 +1,6 @@
|
||||
/* Subroutines common to both C and C++ pretty-printers.
|
||||
- Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
|
||||
+ Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||
+ Free Software Foundation, Inc.
|
||||
Contributed by Gabriel Dos Reis <gdr@integrable-solutions.net>
|
||||
|
||||
This file is part of GCC.
|
||||
@@ -1737,10 +1738,14 @@ pp_c_and_expression (c_pretty_printer *p
|
||||
static void
|
||||
pp_c_exclusive_or_expression (c_pretty_printer *pp, tree e)
|
||||
{
|
||||
- if (TREE_CODE (e) == BIT_XOR_EXPR)
|
||||
+ if (TREE_CODE (e) == BIT_XOR_EXPR
|
||||
+ || TREE_CODE (e) == TRUTH_XOR_EXPR)
|
||||
{
|
||||
pp_c_exclusive_or_expression (pp, TREE_OPERAND (e, 0));
|
||||
- pp_c_maybe_whitespace (pp);
|
||||
+ if (TREE_CODE (e) == BIT_XOR_EXPR)
|
||||
+ pp_c_maybe_whitespace (pp);
|
||||
+ else
|
||||
+ pp_c_whitespace (pp);
|
||||
pp_carret (pp);
|
||||
pp_c_whitespace (pp);
|
||||
pp_c_and_expression (pp, TREE_OPERAND (e, 1));
|
||||
@@ -1775,7 +1780,8 @@ pp_c_inclusive_or_expression (c_pretty_p
|
||||
static void
|
||||
pp_c_logical_and_expression (c_pretty_printer *pp, tree e)
|
||||
{
|
||||
- if (TREE_CODE (e) == TRUTH_ANDIF_EXPR)
|
||||
+ if (TREE_CODE (e) == TRUTH_ANDIF_EXPR
|
||||
+ || TREE_CODE (e) == TRUTH_AND_EXPR)
|
||||
{
|
||||
pp_c_logical_and_expression (pp, TREE_OPERAND (e, 0));
|
||||
pp_c_whitespace (pp);
|
||||
@@ -1794,7 +1800,8 @@ pp_c_logical_and_expression (c_pretty_pr
|
||||
void
|
||||
pp_c_logical_or_expression (c_pretty_printer *pp, tree e)
|
||||
{
|
||||
- if (TREE_CODE (e) == TRUTH_ORIF_EXPR)
|
||||
+ if (TREE_CODE (e) == TRUTH_ORIF_EXPR
|
||||
+ || TREE_CODE (e) == TRUTH_OR_EXPR)
|
||||
{
|
||||
pp_c_logical_or_expression (pp, TREE_OPERAND (e, 0));
|
||||
pp_c_whitespace (pp);
|
||||
@@ -1963,6 +1970,7 @@ pp_c_expression (c_pretty_printer *pp, t
|
||||
break;
|
||||
|
||||
case BIT_XOR_EXPR:
|
||||
+ case TRUTH_XOR_EXPR:
|
||||
pp_c_exclusive_or_expression (pp, e);
|
||||
break;
|
||||
|
||||
@@ -1971,10 +1979,12 @@ pp_c_expression (c_pretty_printer *pp, t
|
||||
break;
|
||||
|
||||
case TRUTH_ANDIF_EXPR:
|
||||
+ case TRUTH_AND_EXPR:
|
||||
pp_c_logical_and_expression (pp, e);
|
||||
break;
|
||||
|
||||
case TRUTH_ORIF_EXPR:
|
||||
+ case TRUTH_OR_EXPR:
|
||||
pp_c_logical_or_expression (pp, e);
|
||||
break;
|
||||
|
||||
--- gcc/cp/error.c.jj 2008-01-22 15:19:30.000000000 +0100
|
||||
+++ gcc/cp/error.c 2008-01-25 18:20:30.000000000 +0100
|
||||
@@ -2083,6 +2083,16 @@ dump_expr (tree t, int flags)
|
||||
pp_expression (cxx_pp, t);
|
||||
break;
|
||||
|
||||
+ case TRUTH_AND_EXPR:
|
||||
+ case TRUTH_OR_EXPR:
|
||||
+ case TRUTH_XOR_EXPR:
|
||||
+ if (flags & TFF_EXPR_IN_PARENS)
|
||||
+ pp_cxx_left_paren (cxx_pp);
|
||||
+ pp_expression (cxx_pp, t);
|
||||
+ if (flags & TFF_EXPR_IN_PARENS)
|
||||
+ pp_cxx_right_paren (cxx_pp);
|
||||
+ break;
|
||||
+
|
||||
case OBJ_TYPE_REF:
|
||||
dump_expr (resolve_virtual_fun_from_obj_type_ref (t), flags);
|
||||
break;
|
||||
--- gcc/testsuite/gcc.dg/pr34965.c.jj 2008-01-25 18:25:46.000000000 +0100
|
||||
+++ gcc/testsuite/gcc.dg/pr34965.c 2008-01-25 18:26:05.000000000 +0100
|
||||
@@ -0,0 +1,13 @@
|
||||
+/* PR c++/34965 */
|
||||
+/* { dg-do compile } */
|
||||
+/* { dg-options "-O" } */
|
||||
+
|
||||
+int foo (int);
|
||||
+
|
||||
+void
|
||||
+bar (int i, int j, double k)
|
||||
+{
|
||||
+ foo (i && j) (); /* { dg-error "\\(i != 0 \\&\\& j != 0\\)" } */
|
||||
+ foo (!i || !j) (); /* { dg-error "\\(i == 0 \\|\\| j == 0\\)" } */
|
||||
+ foo (!i == !j) (); /* { dg-error "\\(i != 0 \\^ j == 0\\)" } */
|
||||
+}
|
||||
--- gcc/testsuite/g++.dg/other/error24.C.jj 2008-01-25 14:38:12.000000000 +0100
|
||||
+++ gcc/testsuite/g++.dg/other/error24.C 2008-01-25 18:25:01.000000000 +0100
|
||||
@@ -0,0 +1,13 @@
|
||||
+// PR c++/34965
|
||||
+// { dg-do compile }
|
||||
+// { dg-options "-O" }
|
||||
+
|
||||
+int foo (int);
|
||||
+
|
||||
+void
|
||||
+bar (int i, int j, double k)
|
||||
+{
|
||||
+ foo (i && j) (); // { dg-error "\\(\\(?i != 0\\)? \\&\\& \\(?j != 0\\)?\\)" }
|
||||
+ foo (!i || !j) (); // { dg-error "\\(\\(?i == 0\\)? \\|\\| \\(?j == 0\\)?\\)" }
|
||||
+ foo (!i == !j) (); // { dg-error "\\(\\(?i != 0\\)? \\^ \\(?j == 0\\)?\\)" }
|
||||
+}
|
||||
@ -1,19 +0,0 @@
|
||||
2008-01-26 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* gcc.c-torture/compile/pr34966.c (atan): Only use asm
|
||||
on i?86/x86_64.
|
||||
|
||||
--- gcc/testsuite/gcc.c-torture/compile/pr34966.c.jj 2008-01-26 09:55:35.000000000 +0100
|
||||
+++ gcc/testsuite/gcc.c-torture/compile/pr34966.c 2008-01-26 10:00:22.000000000 +0100
|
||||
@@ -4,7 +4,11 @@ __inline double
|
||||
atan (double __x)
|
||||
{
|
||||
register double __result;
|
||||
+#if defined(__i386__) || defined(__x86_64__)
|
||||
__asm __volatile__ ("" : "=t" (__result) : "0" (__x));
|
||||
+#else
|
||||
+ __result = __x;
|
||||
+#endif
|
||||
return __result;
|
||||
}
|
||||
|
||||
14
gcc43.spec
14
gcc43.spec
@ -1,6 +1,6 @@
|
||||
%define DATE 20080126
|
||||
%define DATE 20080130
|
||||
%define gcc_version 4.3.0
|
||||
%define gcc_release 0.6
|
||||
%define gcc_release 0.7
|
||||
%define _unpackaged_files_terminate_build 0
|
||||
%define multilib_64_archs sparc64 ppc64 s390x x86_64
|
||||
%define include_gappletviewer 1
|
||||
@ -140,8 +140,6 @@ Patch10: gcc43-rh330771.patch
|
||||
Patch11: gcc43-rh341221.patch
|
||||
Patch12: gcc43-cpp-pragma.patch
|
||||
Patch13: gcc43-java-debug-iface-type.patch
|
||||
Patch14: gcc43-pr34965.patch
|
||||
Patch15: gcc43-pr34966-test.patch
|
||||
|
||||
# On ARM EABI systems, we do want -gnueabi to be part of the
|
||||
# target triple.
|
||||
@ -438,8 +436,6 @@ which are required to run programs compiled with the GNAT.
|
||||
%patch11 -p0 -b .rh341221~
|
||||
%patch12 -p0 -b .cpp-pragma~
|
||||
%patch13 -p0 -b .java-debug-iface-type~
|
||||
%patch14 -p0 -b .pr34965~
|
||||
%patch15 -p0 -b .pr34966-test~
|
||||
|
||||
tar xzf %{SOURCE4}
|
||||
|
||||
@ -1653,7 +1649,11 @@ fi
|
||||
%doc rpm.doc/changelogs/libmudflap/ChangeLog*
|
||||
|
||||
%changelog
|
||||
* Fri Jan 10 2008 Jakub Jelinek <jakub@redhat.com> 4.3.0-0.6
|
||||
* Wed Jan 30 2008 Jakub Jelinek <jakub@redhat.com> 4.3.0-0.7
|
||||
- update from trunk
|
||||
- fix ISO C99 6.7.4p3 diagnostics (#427634, PR c/35017)
|
||||
|
||||
* Fri Jan 25 2008 Jakub Jelinek <jakub@redhat.com> 4.3.0-0.6
|
||||
- update from the trunk
|
||||
|
||||
* Thu Jan 10 2008 Jakub Jelinek <jakub@redhat.com> 4.3.0-0.5
|
||||
|
||||
Loading…
Reference in New Issue
Block a user