Alexandre Julliard : winegcc: No longer use a constructor for module initialization.
Alexandre Julliard
julliard at winehq.org
Tue Apr 21 15:59:46 CDT 2020
Module: wine
Branch: master
Commit: 1ccd638b1aa85fb3c43b49d69d279cd509ebdc21
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ccd638b1aa85fb3c43b49d69d279cd509ebdc21
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Apr 21 11:27:53 2020 +0200
winegcc: No longer use a constructor for module initialization.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
tools/winegcc/winegcc.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 0682e9aa9a..5ea99d3cf0 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -534,8 +534,6 @@ static strarray *get_link_args( struct options *opts, const char *output_name )
strarray_add( flags, "-Wl,--no-wchar-size-warning" );
if (!try_link( opts->prefix, link_args, "-Wl,-z,defs" ))
strarray_add( flags, "-Wl,-z,defs" );
- if (opts->shared && !try_link( opts->prefix, link_args, "-Wl,-init,__wine_spec_init" ))
- strarray_add( flags, "-Wl,-init,__wine_spec_init" );
strarray_addall( link_args, flags );
return link_args;
@@ -1379,8 +1377,8 @@ static void build(struct options* opts)
}
}
- if (!is_pe && !opts->shared) fixup_constructors( opts, output_path );
- if (is_pe && opts->wine_builtin) make_wine_builtin( opts, output_path );
+ if (!is_pe) fixup_constructors( opts, output_path );
+ else if (opts->wine_builtin) make_wine_builtin( opts, output_path );
/* create the loader script */
if (generate_app_loader)
More information about the wine-cvs
mailing list