sync with OpenBSD -current

This commit is contained in:
purplerain 2024-02-12 22:05:39 +00:00
parent e51bf6e676
commit c151d49b7a
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
6 changed files with 20 additions and 14 deletions

View file

@ -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");