diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 49c49c2be6..b9f5970ba5 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-04  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-bfd.h (SYMBOL_REFERENCES_LOCAL, SYMBOL_CALLS_LOCAL): Return
+	true even if -pie.
+
 2003-07-04  Jakub Jelinek  <jakub@redhat.com>
 
 	* elfxx-ia64.c (struct elfNN_ia64_link_hash_table): Add rel_fptr_sec.
diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
index 1b9ec8ae25..410e91f2cb 100644
--- a/bfd/elf-bfd.h
+++ b/bfd/elf-bfd.h
@@ -217,7 +217,7 @@ struct elf_link_hash_entry
    it's necessary for shared libs to also reference the .plt even
    though the symbol is really local to the shared lib.  */
 #define SYMBOL_REFERENCES_LOCAL(INFO, H)				\
-  ((! (INFO)->shared							\
+  (((INFO)->executable							\
     || (INFO)->symbolic							\
     || (H)->dynindx == -1						\
     || ELF_ST_VISIBILITY ((H)->other) == STV_INTERNAL			\
@@ -227,7 +227,7 @@ struct elf_link_hash_entry
 
 /* Will _calls_ to this symbol always call the version in this object?  */
 #define SYMBOL_CALLS_LOCAL(INFO, H)					\
-  ((! (INFO)->shared							\
+  (((INFO)->executable							\
     || (INFO)->symbolic							\
     || (H)->dynindx == -1						\
     || ELF_ST_VISIBILITY ((H)->other) != STV_DEFAULT			\