[ARC][committed] Code cleanup and improvements.

[binutils-gdb.git] / ld / emulparams / call_nop.sh

diff --git a/ld/emulparams/call_nop.sh b/ld/emulparams/call_nop.sh
index fee4a8154e9ded2c6327763a807e8e38a13d6f61..b1e2e73cbf83801a009d29f04005a208c9f61491 100644 (file)
--- a/ld/emulparams/call_nop.sh
+++ b/ld/emulparams/call_nop.sh
@@ -7,39 +7,34 @@ PARSE_AND_LIST_ARGS_CASE_Z_CALL_NOP='
        {
          if (strcmp (optarg + 9, "prefix-addr") == 0)
            {
-             link_info.call_nop_as_suffix = FALSE;
-             link_info.call_nop_byte = 0x67;
-           }
-         else if (strcmp (optarg + 9, "prefix-nop") == 0)
-           {
-             link_info.call_nop_as_suffix = FALSE;
-             link_info.call_nop_byte = 0x90;
+             params.call_nop_as_suffix = FALSE;
+             params.call_nop_byte = 0x67;
            }
          else if (strcmp (optarg + 9, "suffix-nop") == 0)
            {
-             link_info.call_nop_as_suffix = TRUE;
-             link_info.call_nop_byte = 0x90;
+             params.call_nop_as_suffix = TRUE;
+             params.call_nop_byte = 0x90;
            }
          else if (strncmp (optarg + 9, "prefix-", 7) == 0)
            {
              char *end;
-             link_info.call_nop_byte = strtoul (optarg + 16 , &end, 0);
+             params.call_nop_byte = strtoul (optarg + 16 , &end, 0);
              if (*end)
-               einfo (_("%P%F: invalid number for -z call-nop=prefix-: %s\n"),
+               einfo (_("%F%P: invalid number for -z call-nop=prefix-: %s\n"),
                       optarg + 16);
-             link_info.call_nop_as_suffix = FALSE;
+             params.call_nop_as_suffix = FALSE;
            }
          else if (strncmp (optarg + 9, "suffix-", 7) == 0)
            {
              char *end;
-             link_info.call_nop_byte = strtoul (optarg + 16, &end, 0);
+             params.call_nop_byte = strtoul (optarg + 16, &end, 0);
              if (*end)
-               einfo (_("%P%F: invalid number for -z call-nop=suffix-: %s\n"),
+               einfo (_("%F%P: invalid number for -z call-nop=suffix-: %s\n"),
                       optarg + 16);
-             link_info.call_nop_as_suffix = TRUE;
+             params.call_nop_as_suffix = TRUE;
            }
          else
-           einfo (_("%P%F: unsupported option: -z %s\n"), optarg);
+           einfo (_("%F%P: unsupported option: -z %s\n"), optarg);
        }
 '