combine.c (merge_outer_ops): Fix typo.

	2003-04-01  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>

	* combine.c (merge_outer_ops): Fix typo.

	* varasm.c (make_decl_one_only): Revert 2003-03-09 patch.

From-SVN: r65136

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b08ab41f98d6a066282bab97f77b2b7e93f8570a..5f9aed3fad0858d4a633d799df9b81cdf4338b23 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-01  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
+
+       * combine.c (merge_outer_ops): Fix typo.
+
+       * varasm.c (make_decl_one_only): Revert 2003-03-09 patch.
+
 2003-04-01  David Edelsohn  <edelsohn@gnu.org>
 
        * config/rs6000/{40x.md,603.md,6xx.md,7450.md,7xx.md,mpc.md,

diff --git a/gcc/combine.c b/gcc/combine.c
index a36ee033e958190cf2ed2b2299251518fef8091e..ed98db217ebb9f45718e6c0154580eca689ef419 100644 (file)
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -9231,7 +9231,7 @@ merge_outer_ops (pop0, pconst0, op1, const1, mode, pcomp_p)
          op0 = AND, *pcomp_p = 1;
        else /* op1 == IOR */
          /* (a | b) ^ b == a & ~b */
-         op0 = AND, *pconst0 = ~const0;
+         op0 = AND, const0 = ~const0;
        break;
 
       case AND:

diff --git a/gcc/varasm.c b/gcc/varasm.c
index 9c93e9bd26db5420d805436a84a66470324716f4..0289a7c9fca241fd9038424fadf6a2b5a3af1c1f 100644 (file)
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -4706,7 +4706,7 @@ make_decl_one_only (decl)
       DECL_ONE_ONLY (decl) = 1;
     }
   else if (SUPPORTS_WEAK)
-    declare_weak (decl);
+    DECL_WEAK (decl) = 1;
   else
     abort ();
 }