diff options
Diffstat (limited to 'ld/emultempl/alphaelf.em')
| -rw-r--r-- | ld/emultempl/alphaelf.em | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/ld/emultempl/alphaelf.em b/ld/emultempl/alphaelf.em index 864e699..7b7c8d7 100644 --- a/ld/emultempl/alphaelf.em +++ b/ld/emultempl/alphaelf.em @@ -30,7 +30,6 @@ fragment <<EOF #include "elf-bfd.h" static bfd_boolean limit_32bit; -static bfd_boolean disable_relaxation; extern bfd_boolean elf64_alpha_use_secureplt; @@ -91,8 +90,8 @@ alpha_before_allocation (void) gld${EMULATION_NAME}_before_allocation (); /* Add -relax if -O, not -r, and not explicitly disabled. */ - if (link_info.optimize && !link_info.relocatable && !disable_relaxation) - command_line.relax = TRUE; + if (link_info.optimize && !link_info.relocatable && ! RELAXATION_DISABLED_BY_USER) + ENABLE_RELAXATION; } static void @@ -110,14 +109,12 @@ EOF # PARSE_AND_LIST_PROLOGUE=' #define OPTION_TASO 300 -#define OPTION_NO_RELAX (OPTION_TASO + 1) -#define OPTION_SECUREPLT (OPTION_NO_RELAX + 1) +#define OPTION_SECUREPLT (OPTION_TASO + 1) #define OPTION_NO_SECUREPLT (OPTION_SECUREPLT + 1) ' PARSE_AND_LIST_LONGOPTS=' { "taso", no_argument, NULL, OPTION_TASO }, - { "no-relax", no_argument, NULL, OPTION_NO_RELAX }, { "secureplt", no_argument, NULL, OPTION_SECUREPLT }, { "no-secureplt", no_argument, NULL, OPTION_NO_SECUREPLT }, ' @@ -126,7 +123,6 @@ PARSE_AND_LIST_OPTIONS=' fprintf (file, _("\ --taso Load executable in the lower 31-bit addressable\n\ virtual address range.\n\ - --no-relax Do not relax call and gp sequences.\n\ --secureplt Force PLT in text segment.\n\ --no-secureplt Force PLT in data segment.\n\ ")); @@ -136,9 +132,6 @@ PARSE_AND_LIST_ARGS_CASES=' case OPTION_TASO: limit_32bit = 1; break; - case OPTION_NO_RELAX: - disable_relaxation = TRUE; - break; case OPTION_SECUREPLT: elf64_alpha_use_secureplt = TRUE; break; |