re PR target/42854 (FAIL: gcc.dg/darwin-weakimport-[13].c scan-assembler-not *)

	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.

Co-Authored-By: Jakub Jelinek <jakub@redhat.com>

From-SVN: r156786

gcc/ChangeLog

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

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))

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);				\