diff options
| author | Alan Modra <amodra@gmail.com> | 2011-07-14 12:43:35 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2011-07-14 12:43:35 +0000 |
| commit | 2d07dfae310a942c460ba9ffc3182ba06ccf4b47 (patch) | |
| tree | 6ae850b5e32e193df9dae04e9c4c2e85c5c4cb15 /ld | |
| parent | 29e045d58b27dbe405e9735a0af667ca501915d0 (diff) | |
| download | binutils-gdb-2d07dfae310a942c460ba9ffc3182ba06ccf4b47.tar.gz | |
* emultempl/elf32.em (gld${EMULATION_NAME}_handle_option,
gld${EMULATION_NAME}_list_options): Don't condition -z relro
and -z norelro on COMMONPAGESIZE being defined.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/emultempl/elf32.em | 15 |
2 files changed, 6 insertions, 15 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 69510b160a4..7eda3792247 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,11 @@ 2011-07-14 Alan Modra <amodra@gmail.com> + * emultempl/elf32.em (gld${EMULATION_NAME}_handle_option, + gld${EMULATION_NAME}_list_options): Don't condition -z relro + and -z norelro on COMMONPAGESIZE being defined. + +2011-07-14 Alan Modra <amodra@gmail.com> + * emultempl/ppc64elf.em (plt_static_chain): New var. (gld${EMULATION_NAME}_after_allocation): Pass to ppc64_elf_size_stubs. (PARSE_AND_LIST_PROLOGUE, PARSE_AND_LIST_LONGOPTS, diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em index 16cbaa4ac88..9bc363f3331 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em @@ -2323,16 +2323,11 @@ fragment <<EOF link_info.combreloc = FALSE; else if (strcmp (optarg, "nocopyreloc") == 0) link_info.nocopyreloc = TRUE; -EOF - - if test -n "$COMMONPAGESIZE"; then -fragment <<EOF else if (strcmp (optarg, "relro") == 0) link_info.relro = TRUE; else if (strcmp (optarg, "norelro") == 0) link_info.relro = FALSE; EOF - fi fi fragment <<EOF @@ -2444,27 +2439,17 @@ fragment <<EOF -z noexecstack Mark executable as not requiring executable stack\n")); EOF if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then - if test -n "$COMMONPAGESIZE"; then fragment <<EOF fprintf (file, _("\ -z norelro Don't create RELRO program header\n")); -EOF - fi - -fragment <<EOF fprintf (file, _("\ -z now Mark object non-lazy runtime binding\n")); fprintf (file, _("\ -z origin Mark object requiring immediate \$ORIGIN\n\ processing at runtime\n")); -EOF - - if test -n "$COMMONPAGESIZE"; then -fragment <<EOF fprintf (file, _("\ -z relro Create RELRO program header\n")); EOF - fi fi if test -n "$PARSE_AND_LIST_OPTIONS" ; then |