From: Tres Finocchiaro tres.finocchiaro@gmail.com
--- tools/winebuild/main.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 8683b5874de..8d407f18e6a 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -36,7 +36,6 @@ int UsePIC = 0; int nb_errors = 0; int display_warnings = 0; -int disable_dynamicbase = 0; int native_arch = -1; int kill_at = 0; int verbose = 0; @@ -441,7 +440,7 @@ static void option_callback( int optc, char *optarg ) set_exec_mode( MODE_DEF ); break; case LONG_OPT_DISABLE_DYNAMICBASE: - disable_dynamicbase = 1; + main_spec->dll_characteristics &= ~IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE; break; case LONG_OPT_EXE: set_exec_mode( MODE_EXE ); @@ -605,13 +604,8 @@ int main(int argc, char **argv) else { spec->characteristics |= IMAGE_FILE_LARGE_ADDRESS_AWARE; - if (!disable_dynamicbase) { - spec->dll_characteristics |= IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA; - } - } - - if (disable_dynamicbase) { - spec->dll_characteristics &= ~IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE; + /* no-op if disable-dynamicbase is set */ + spec->dll_characteristics |= IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA; }
check_target();