PR target/42854

	* config/darwin.h (ASM_WEAKEN_DECL): Don't check weak attribute
	if weak_import attribute is present.
	* config/darwin.c (machopic_select_section): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@156786 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9b0682c..9f65cdd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-16  Jack Howarth <howarth@bromo.med.uc.edu>
+            Jakub Jelinek <jakub@redhat.com>
+
+       PR target/42854
+       * config/darwin.h (ASM_WEAKEN_DECL): Don't check weak attribute
+       if weak_import attribute is present.
+       * config/darwin.c (machopic_select_section): Likewise.
+
 2010-02-15  Joern Rennecke  <joern.rennecke@embecosm.com>
 
        * doc/tm.texi (TARGET_VECTORIZE_BUILTIN_VECTORIZATION_COST): Document.

diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 1880063..3ca507c 100644 (file)
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -1177,9 +1177,8 @@ machopic_select_section (tree decl,
 {
   bool weak = (DECL_P (decl)
               && DECL_WEAK (decl)
-              && (lookup_attribute ("weak", DECL_ATTRIBUTES (decl))
-                  || ! lookup_attribute ("weak_import",
-                                         DECL_ATTRIBUTES (decl))));
+              && !lookup_attribute ("weak_import",
+              DECL_ATTRIBUTES (decl)));
   section *base_section;
 
   switch (categorize_decl_for_section (decl, reloc))

diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index c42bf34..763040b 100644 (file)
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -502,8 +502,7 @@ extern GTY(()) int darwin_ms_struct;
       targetm.asm_out.globalize_label (FILE, NAME);                    \
     if (DECL_EXTERNAL (DECL))                                          \
       fputs ("\t.weak_reference ", FILE);                              \
-    else if (! lookup_attribute ("weak", DECL_ATTRIBUTES (DECL))       \
-       && lookup_attribute ("weak_import", DECL_ATTRIBUTES (DECL)))    \
+    else if (lookup_attribute ("weak_import", DECL_ATTRIBUTES (DECL))) \
       break;                                                           \
     else if (TREE_PUBLIC (DECL))                                       \
       fputs ("\t.weak_definition ", FILE);                             \