aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2018-03-01 12:35:03 +0100
committerAndreas K. Hüttel <dilfridge@gentoo.org>2018-07-15 13:26:20 +0200
commitf4bac53b42ca13a870cea5f4281f63ebcd521008 (patch)
tree9da5434adf57ff2fef4dde501c4bf764eb02d651
parentGentoo: Pass --no-warn-shared-textrel to ld in its testsuite (diff)
downloadbinutils-gdb-f4bac53b42ca13a870cea5f4281f63ebcd521008.tar.gz
binutils-gdb-f4bac53b42ca13a870cea5f4281f63ebcd521008.tar.bz2
binutils-gdb-f4bac53b42ca13a870cea5f4281f63ebcd521008.zip
Gentoo: Restore TEXTREL warnings for non-shared objects
-rw-r--r--bfd/elflink.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/bfd/elflink.c b/bfd/elflink.c
index b24fb95848d..447af8f08c9 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -12656,7 +12656,7 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
goto error_return;
/* Check for DT_TEXTREL (late, in case the backend removes it). */
- if (((info->warn_shared_textrel && bfd_link_pic (info))
+ if ((info->warn_shared_textrel
|| info->error_textrel)
&& (o = bfd_get_linker_section (dynobj, ".dynamic")) != NULL)
{
@@ -12677,7 +12677,7 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
(_("%P%X: read-only segment has dynamic relocations\n"));
else
info->callbacks->einfo
- (_("%P: warning: creating a DT_TEXTREL in a shared object\n"));
+ (_("%P: warning: creating a DT_TEXTREL in object\n"));
break;
}
}