sync with OpenBSD -current
This commit is contained in:
parent
e51bf6e676
commit
c151d49b7a
6 changed files with 20 additions and 14 deletions
|
@ -1301,11 +1301,7 @@ static void readConfigs(opt::InputArgList &args) {
|
|||
config->zOrigin = hasZOption(args, "origin");
|
||||
config->zPacPlt = hasZOption(args, "pac-plt");
|
||||
config->zRelro = getZFlag(args, "relro", "norelro", true);
|
||||
#ifndef __OpenBSD__
|
||||
config->zRetpolineplt = getZFlag(args, "retpolineplt", "noretpolineplt", false);
|
||||
#else
|
||||
config->zRetpolineplt = getZFlag(args, "retpolineplt", "noretpolineplt", true);
|
||||
#endif
|
||||
config->zRetpolineplt = hasZOption(args, "retpolineplt");
|
||||
config->zRodynamic = hasZOption(args, "rodynamic");
|
||||
config->zSeparate = getZSeparate(args);
|
||||
config->zShstk = hasZOption(args, "shstk");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue