From 7d4444ea03094bc9ce7f683f14be6d9cd7969ede Mon Sep 17 00:00:00 2001 From: Franz Sirl Date: Tue, 1 Apr 2003 18:33:51 +0000 Subject: [PATCH] combine.c (merge_outer_ops): Fix typo. 2003-04-01 Franz Sirl * combine.c (merge_outer_ops): Fix typo. * varasm.c (make_decl_one_only): Revert 2003-03-09 patch. From-SVN: r65136 --- gcc/ChangeLog | 6 ++++++ gcc/combine.c | 2 +- gcc/varasm.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b08ab41f98d..5f9aed3fad0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-04-01 Franz Sirl + + * combine.c (merge_outer_ops): Fix typo. + + * varasm.c (make_decl_one_only): Revert 2003-03-09 patch. + 2003-04-01 David Edelsohn * 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 a36ee033e95..ed98db217eb 100644 --- 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 9c93e9bd26d..0289a7c9fca 100644 --- 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 (); } -- 2.30.2