ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winegcc: Add support for building native subsystem libraries. 

Based on a patch by Zebediah Figura.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2018-05-01 12:57:54 +02:00
parent 0b90dc78a4
commit 470bd0c2fa
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tools/winegcc/winegcc.c
View File

@ -210,6 +210,7 @@ struct options
const char* image_base; const char* image_base;
const char* section_align; const char* section_align;
const char* lib_suffix; const char* lib_suffix;
const char* subsystem;
strarray* prefix; strarray* prefix;
strarray* lib_dirs; strarray* lib_dirs;
strarray* linker_args; strarray* linker_args;
@ -913,7 +914,19 @@ static void build(struct options* opts)
else else
{ {
strarray_add(link_args, opts->gui_app ? "-mwindows" : "-mconsole"); strarray_add(link_args, opts->gui_app ? "-mwindows" : "-mconsole");
}
if (opts->nodefaultlibs) strarray_add(link_args, "-nodefaultlibs"); if (opts->nodefaultlibs) strarray_add(link_args, "-nodefaultlibs");
if (opts->nostartfiles) strarray_add(link_args, "-nostartfiles" );
if (opts->subsystem)
{
strarray_add(link_args, strmake("-Wl,--subsystem,%s", opts->subsystem));
if (!strcmp( opts->subsystem, "native" ))
{
const char *entry = opts->target_cpu == CPU_x86 ? "_DriverEntry@8" : "DriverEntry";
strarray_add(link_args, strmake( "-Wl,--entry,%s", entry ));
}
} }
for ( j = 0 ; j < opts->linker_args->size ; j++ ) for ( j = 0 ; j < opts->linker_args->size ; j++ )
@ -1070,6 +1083,12 @@ static void build(struct options* opts)
if (opts->large_address_aware) strarray_add( spec_args, "--large-address-aware" ); if (opts->large_address_aware) strarray_add( spec_args, "--large-address-aware" );
} }
if (opts->subsystem)
{
strarray_add(spec_args, "--subsystem");
strarray_add(spec_args, opts->subsystem);
}
for ( j = 0; j < lib_dirs->size; j++ ) for ( j = 0; j < lib_dirs->size; j++ )
strarray_add(spec_args, strmake("-L%s", lib_dirs->base[j])); strarray_add(spec_args, strmake("-L%s", lib_dirs->base[j]));
@ -1211,19 +1230,11 @@ static void forward(int argc, char **argv, struct options* opts)
strarray_free (args); strarray_free (args);
} }
/*
* Linker Options
* object-file-name -llibrary -nostartfiles -nodefaultlibs
* -nostdlib -s -static -static-libgcc -shared -shared-libgcc
* -symbolic -Wl,option -Xlinker option -u symbol
* -framework name
*/
static int is_linker_arg(const char* arg) static int is_linker_arg(const char* arg)
{ {
static const char* link_switches[] = static const char* link_switches[] =
{ {
"-nostartfiles", "-nostdlib", "-s", "-nostdlib", "-s", "-static", "-static-libgcc", "-shared", "-shared-libgcc", "-symbolic",
"-static", "-static-libgcc", "-shared", "-shared-libgcc", "-symbolic",
"-framework", "--coverage", "-fprofile-generate", "-fprofile-use" "-framework", "--coverage", "-fprofile-generate", "-fprofile-use"
}; };
unsigned int j; unsigned int j;
@ -1600,6 +1611,11 @@ int main(int argc, char **argv)
opts.large_address_aware = 1; opts.large_address_aware = 1;
continue; continue;
} }
if (!strcmp(Wl->base[j], "--subsystem") && j < Wl->size - 1)
{
opts.subsystem = strdup( Wl->base[++j] );
continue;
}
if (!strcmp(Wl->base[j], "-static")) linking = -1; if (!strcmp(Wl->base[j], "-static")) linking = -1;
strarray_add(opts.linker_args, strmake("-Wl,%s",Wl->base[j])); strarray_add(opts.linker_args, strmake("-Wl,%s",Wl->base[j]));
} }