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

gcc/ChangeLog

+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,

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:

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 ();
 }