* 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.
This commit is contained in:
Alan Modra 2011-07-14 12:43:35 +00:00
parent 29e045d58b
commit 2d07dfae31
2 changed files with 6 additions and 15 deletions

View File

@ -1,3 +1,9 @@
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.

View File

@ -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