ld-x86-64: Pass -z notext to linker for tests with DT_TEXTREL

[deliverable/binutils-gdb.git] / ld / lexsup.c

diff --git a/ld/lexsup.c b/ld/lexsup.c
index fe9526b527197e6d2adbb3026367e5ed0d3f634f..04db2f129f872891b5d97ccb223e023a6cf21140 100644 (file)
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -1390,22 +1390,16 @@ parse_args (unsigned argc, char **argv)
          break;
        case OPTION_DYNAMIC_LIST_DATA:
          opt_dynamic_list = dynamic_list_data;
-         if (opt_symbolic == symbolic)
-           opt_symbolic = symbolic_unset;
          break;
        case OPTION_DYNAMIC_LIST_CPP_TYPEINFO:
          lang_append_dynamic_list_cpp_typeinfo ();
          if (opt_dynamic_list != dynamic_list_data)
            opt_dynamic_list = dynamic_list;
-         if (opt_symbolic == symbolic)
-           opt_symbolic = symbolic_unset;
          break;
        case OPTION_DYNAMIC_LIST_CPP_NEW:
          lang_append_dynamic_list_cpp_new ();
          if (opt_dynamic_list != dynamic_list_data)
            opt_dynamic_list = dynamic_list;
-         if (opt_symbolic == symbolic)
-           opt_symbolic = symbolic_unset;
          break;
        case OPTION_DYNAMIC_LIST:
          /* This option indicates a small script that only specifies
@@ -1422,8 +1416,6 @@ parse_args (unsigned argc, char **argv)
          }
          if (opt_dynamic_list != dynamic_list_data)
            opt_dynamic_list = dynamic_list;
-         if (opt_symbolic == symbolic)
-           opt_symbolic = symbolic_unset;
          break;
        case OPTION_WARN_COMMON:
          config.warn_common = TRUE;
@@ -1632,6 +1624,19 @@ parse_args (unsigned argc, char **argv)
       && command_line.check_section_addresses < 0)
     command_line.check_section_addresses = 0;
 
+  switch (opt_dynamic_list)
+    {
+    case dynamic_list_unset:
+      break;
+    case dynamic_list_data:
+      link_info.dynamic_data = TRUE;
+      /* Fall through.  */
+    case dynamic_list:
+      link_info.dynamic = TRUE;
+      opt_symbolic = symbolic_unset;
+      break;
+    }
+
   /* -Bsymbolic and -Bsymbols-functions are for shared library output.  */
   if (bfd_link_dll (&link_info))
     switch (opt_symbolic)
@@ -1651,25 +1656,13 @@ parse_args (unsigned argc, char **argv)
            free (link_info.dynamic_list);
            link_info.dynamic_list = NULL;
          }
-       opt_dynamic_list = dynamic_list_unset;
        break;
       case symbolic_functions:
-       opt_dynamic_list = dynamic_list_data;
+       link_info.dynamic = TRUE;
+       link_info.dynamic_data = TRUE;
        break;
       }
 
-  switch (opt_dynamic_list)
-    {
-    case dynamic_list_unset:
-      break;
-    case dynamic_list_data:
-      link_info.dynamic_data = TRUE;
-      /* Fall through.  */
-    case dynamic_list:
-      link_info.dynamic = TRUE;
-      break;
-    }
-
   if (!bfd_link_dll (&link_info))
     {
       if (command_line.filter_shlib)