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

winegcc: Disable setting image base address on Android. 

The Android linker doesn't handle this correctly.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2015-11-16 23:30:10 +09:00
parent bf73faefc7
commit 097006b146
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/winegcc/utils.h
View File

@ -42,7 +42,12 @@ enum target_cpu
enum target_platform enum target_platform
{ {
PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_SOLARIS, PLATFORM_WINDOWS, PLATFORM_CYGWIN PLATFORM_UNSPECIFIED,
PLATFORM_APPLE,
PLATFORM_ANDROID,
PLATFORM_SOLARIS,
PLATFORM_WINDOWS,
PLATFORM_CYGWIN
}; };
void error(const char* s, ...) DECLSPEC_NORETURN; void error(const char* s, ...) DECLSPEC_NORETURN;

7
tools/winegcc/winegcc.c
View File

@ -171,6 +171,7 @@ static const struct
{ {
{ "macos", PLATFORM_APPLE }, { "macos", PLATFORM_APPLE },
{ "darwin", PLATFORM_APPLE }, { "darwin", PLATFORM_APPLE },
{ "android", PLATFORM_ANDROID },
{ "solaris", PLATFORM_SOLARIS }, { "solaris", PLATFORM_SOLARIS },
{ "cygwin", PLATFORM_CYGWIN }, { "cygwin", PLATFORM_CYGWIN },
{ "mingw32", PLATFORM_WINDOWS }, { "mingw32", PLATFORM_WINDOWS },
@ -229,6 +230,8 @@ static const enum target_cpu build_cpu = CPU_ARM64;
#ifdef __APPLE__ #ifdef __APPLE__
static enum target_platform build_platform = PLATFORM_APPLE; static enum target_platform build_platform = PLATFORM_APPLE;
#elif defined(__ANDROID__)
static enum target_platform build_platform = PLATFORM_ANDROID;
#elif defined(__sun) #elif defined(__sun)
static enum target_platform build_platform = PLATFORM_SOLARIS; static enum target_platform build_platform = PLATFORM_SOLARIS;
#elif defined(__CYGWIN__) #elif defined(__CYGWIN__)
@ -384,6 +387,7 @@ static const strarray* get_lddllflags( const struct options *opts, const strarra
} }
break; break;
case PLATFORM_ANDROID:
case PLATFORM_SOLARIS: case PLATFORM_SOLARIS:
case PLATFORM_UNSPECIFIED: case PLATFORM_UNSPECIFIED:
strarray_add( flags, "-shared" ); strarray_add( flags, "-shared" );
@ -1121,6 +1125,9 @@ static void build(struct options* opts)
strarray_add(tmp_files, mapfile); strarray_add(tmp_files, mapfile);
} }
break; break;
case PLATFORM_ANDROID:
/* not supported on Android */
break;
default: default:
if (opts->image_base) if (opts->image_base)
{ {