ld: Add --warn-textrel and obsolete --warn-shared-textrel

[deliverable/binutils-gdb.git] / ld / emultempl / elf.em

diff --git a/ld/emultempl/elf.em b/ld/emultempl/elf.em
index eac2ce2f4ca2f5e87fb0c14f6216ba368aee59ed..c4979eb9538234f9629bc32a5272ad07c2d358cd 100644 (file)
--- a/ld/emultempl/elf.em
+++ b/ld/emultempl/elf.em
@@ -620,11 +620,8 @@ gld${EMULATION_NAME}_handle_option (int optc)
       return FALSE;
 
     case OPTION_BUILD_ID:
-      if (ldelf_emit_note_gnu_build_id != NULL)
-       {
-         free ((char *) ldelf_emit_note_gnu_build_id);
-         ldelf_emit_note_gnu_build_id = NULL;
-       }
+      free ((char *) ldelf_emit_note_gnu_build_id);
+      ldelf_emit_note_gnu_build_id = NULL;
       if (optarg == NULL)
        optarg = DEFAULT_BUILD_ID_STYLE;
       if (strcmp (optarg, "none"))
@@ -806,11 +803,11 @@ fragment <<EOF
       else if (strcmp (optarg, "nocommon") == 0)
        link_info.elf_stt_common = no_elf_stt_common;
       else if (strcmp (optarg, "text") == 0)
-       link_info.error_textrel = TRUE;
+       link_info.textrel_check = textrel_check_error;
       else if (strcmp (optarg, "notext") == 0)
-       link_info.error_textrel = FALSE;
+       link_info.textrel_check = textrel_check_none;
       else if (strcmp (optarg, "textoff") == 0)
-       link_info.error_textrel = FALSE;
+       link_info.textrel_check = textrel_check_none;
 EOF
 fi