Alexandre Julliard : winebuild: Remove support for "hybrid" Unix libraries.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ac17191530c6fdaebe7e8761ed85212764ae3eb7
URL:    https://gitlab.winehq.org/wine/wine/-/commit/ac17191530c6fdaebe7e8761ed85212...

Author: Alexandre Julliard 
Date:   Fri Nov 11 12:07:41 2022 +0100

winebuild: Remove support for "hybrid" Unix libraries.

---

tools/winebuild/build.h          |  1 -
 tools/winebuild/import.c         | 10 ----------
 tools/winebuild/main.c           |  4 +---
 tools/winebuild/spec32.c         |  1 -
 tools/winebuild/winebuild.man.in |  3 ---
 5 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h
index a7ef23b199e..576304cd2b8 100644
--- a/tools/winebuild/build.h
+++ b/tools/winebuild/build.h
@@ -360,7 +360,6 @@ extern int force_pointer_size;
 extern int unwind_tables;
 extern int use_dlltool;
 extern int use_msvcrt;
-extern int unix_lib;
 extern int safe_seh;
 extern int prefer_native;
 extern int data_only;
diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c
index c934e456cfe..9f87adcf593 100644
--- a/tools/winebuild/import.c
+++ b/tools/winebuild/import.c
@@ -497,8 +497,6 @@ static int has_stubs( const DLLSPEC *spec )
 {
     int i;

-    if (unix_lib) return 0;
-
     for (i = 0; i < spec->nb_entry_points; i++)
     {
         ORDDEF *odp = &spec->entry_points[i];
@@ -543,8 +541,6 @@ static void check_undefined_forwards( DLLSPEC *spec )
     char *link_name, *api_name, *dll_name, *p;
     int i;

-    if (unix_lib) return;
-
     for (i = 0; i < spec->nb_entry_points; i++)
     {
         ORDDEF *odp = &spec->entry_points[i];
@@ -575,8 +571,6 @@ static void check_undefined_exports( DLLSPEC *spec )
 {
     int i;

-    if (unix_lib) return;
-
     for (i = 0; i < spec->nb_entry_points; i++)
     {
         ORDDEF *odp = &spec->entry_points[i];
@@ -616,8 +610,6 @@ static char *create_undef_symbols_file( DLLSPEC *spec )
     int i;
     unsigned int j;

-    if (unix_lib) return NULL;
-
     as_file = open_temp_output_file( ".s" );
     output( "\t.data\n" );

@@ -1375,8 +1367,6 @@ void output_syscalls( DLLSPEC *spec )
     int i, count;
     ORDDEF **syscalls = NULL;

-    if (unix_lib) return;
-
     for (i = count = 0; i < spec->nb_entry_points; i++)
     {
         ORDDEF *odp = &spec->entry_points[i];
diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c
index 77339b2b4e7..875bf45f0a1 100644
--- a/tools/winebuild/main.c
+++ b/tools/winebuild/main.c
@@ -44,7 +44,6 @@ int force_pointer_size = 0;
 int unwind_tables = 0;
 int use_dlltool = 1;
 int use_msvcrt = 0;
-int unix_lib = 0;
 int safe_seh = 0;
 int prefer_native = 0;
 int data_only = 0;
@@ -408,7 +407,6 @@ static void option_callback( int optc, char *optarg )
         else if (!strcmp( optarg, "arm" )) thumb_mode = 0;
         else if (!strcmp( optarg, "thumb" )) thumb_mode = 1;
         else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1;
-        else if (!strcmp( optarg, "unix" )) unix_lib = 1;
         else if (!strcmp( optarg, "unicode" )) main_spec->unicode_app = 1;
         else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 );
         else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 );
@@ -646,7 +644,7 @@ int main(int argc, char **argv)
     case MODE_EXE:
         files = load_resources( files, spec );
         if (spec_file_name && !parse_input_file( spec )) break;
-        if (!spec->init_func && !unix_lib) spec->init_func = xstrdup( get_default_entry_point( spec ));
+        if (!spec->init_func) spec->init_func = xstrdup( get_default_entry_point( spec ));

if (fake_module)
         {
diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c
index c09e58084cc..a4a95f09c43 100644
--- a/tools/winebuild/spec32.c
+++ b/tools/winebuild/spec32.c
@@ -108,7 +108,6 @@ static int has_relays( DLLSPEC *spec )

static int get_exports_count( DLLSPEC *spec )
 {
-    if (unix_lib) return 0;
     if (spec->base > spec->limit) return 0;
     return spec->limit - spec->base + 1;
 }
diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in
index 7f93a5befdc..23ef3495744 100644
--- a/tools/winebuild/winebuild.man.in
+++ b/tools/winebuild/winebuild.man.in
@@ -186,9 +186,6 @@ Set code generation options for the assembler.
 Build a library that uses the Windows runtime instead of the Unix C
 library.
 .TP
-.B -munix
-Build the Unix counterpart of a builtin module.
-.TP
 .BI -M,\ --main-module= module
 When building a 16-bit dll, set the name of its 32-bit counterpart to
 \fImodule\fR. This is used to enforce that the load order for the