From 1bd6476f2eacdfdda0bc413f404b4b8bd778f802 Mon Sep 17 00:00:00 2001
From: Richard Henderson <rth@redhat.com>
Date: Sun, 24 Mar 2002 16:44:36 -0800
Subject: [PATCH] varasm.c (asm_emit_uninitialised): Revert 2002-03-14 change.

        * varasm.c (asm_emit_uninitialised): Revert 2002-03-14 change.
        Do resolve_unique_section before shared data clause.

        * gcc.dg/weak-1.c: Use -fno-common.

From-SVN: r51289
---
 gcc/ChangeLog                 |  5 +++++
 gcc/testsuite/ChangeLog       |  4 ++++
 gcc/testsuite/gcc.dg/weak-1.c |  2 ++
 gcc/varasm.c                  | 15 +++------------
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ce88f317cdf..7ac7150c19d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-24  Richard Henderson  <rth@redhat.com>
+
+	* varasm.c (asm_emit_uninitialised): Revert 2002-03-14 change.
+	Do resolve_unique_section before shared data clause.
+
 2002-03-24  Richard Henderson  <rth@redhat.com>
 
 	* config/alpha/elf.h (STARTFILE_SPEC): Use crtbeginT with -static.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ac4d80e06c1..528a2dc3a11 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-24  Richard Henderson  <rth@redhat.com>
+
+	* gcc.dg/weak-1.c: Use -fno-common.
+
 2002-03-25  David Billinghurst  <David.Billinghurst@riotinto.com>
 
 	* g77.dg/f77-edit-apostrophe-out.f: New test
diff --git a/gcc/testsuite/gcc.dg/weak-1.c b/gcc/testsuite/gcc.dg/weak-1.c
index 7273bec1734..2e736f8f186 100644
--- a/gcc/testsuite/gcc.dg/weak-1.c
+++ b/gcc/testsuite/gcc.dg/weak-1.c
@@ -1,4 +1,6 @@
 /* { dg-do compile } */
+/* { dg-options "-fno-common" } */
+
 /* COFF does not support weak, and dg doesn't support UNSUPPORTED.  */
 /* { dg-do compile { xfail *-*-coff i?86-pc-cygwin } } */
 
diff --git a/gcc/varasm.c b/gcc/varasm.c
index ef9e87242cd..ad0ef708abf 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -1395,16 +1395,9 @@ asm_emit_uninitialised (decl, name, size, rounded)
 	destination = asm_dest_common;
     }
 
-  switch (destination)
-    {
-    case asm_dest_common:
-      if (! DECL_WEAK (decl))
-	break;
-    case asm_dest_bss:
-      globalize_decl (decl);
-    default:
-      break;
-    }
+  if (destination == asm_dest_bss)
+    globalize_decl (decl);
+  resolve_unique_section (decl, 0);
 
   if (flag_shared_data)
     {
@@ -1430,8 +1423,6 @@ asm_emit_uninitialised (decl, name, size, rounded)
 	}
     }
 
-  resolve_unique_section (decl, 0);
-
   switch (destination)
     {
 #ifdef ASM_EMIT_BSS