0,0 → 1,55 |
http://bugs.gentoo.org/260726 |
|
--- wine-1.1.15/tools/winegcc/winegcc.c |
+++ wine-1.1.15/tools/winegcc/winegcc.c |
@@ -215,10 +215,13 @@ |
strarray* files; |
}; |
|
+#undef FORCE_POINTER_SIZE |
#ifdef __i386__ |
static const enum target_cpu build_cpu = CPU_x86; |
+#define FORCE_POINTER_SIZE |
#elif defined(__x86_64__) |
static const enum target_cpu build_cpu = CPU_x86_64; |
+#define FORCE_POINTER_SIZE |
#elif defined(__sparc__) |
static const enum target_cpu build_cpu = CPU_SPARC; |
#elif defined(__ALPHA__) |
@@ -968,6 +971,9 @@ |
opts.linker_args = strarray_alloc(); |
opts.compiler_args = strarray_alloc(); |
opts.winebuild_args = strarray_alloc(); |
+#ifdef FORCE_POINTER_SIZE |
+ opts.force_pointer_size = sizeof(size_t); |
+#endif |
|
/* determine the processor type */ |
if (strendswith(argv[0], "winecpp")) opts.processor = proc_cpp; |
--- wine-1.1.15/tools/winebuild/main.c |
+++ wine-1.1.15/tools/winebuild/main.c |
@@ -50,10 +50,13 @@ |
int link_ext_symbols = 0; |
int force_pointer_size = 0; |
|
+#undef FORCE_POINTER_SIZE |
#ifdef __i386__ |
enum target_cpu target_cpu = CPU_x86; |
+#define FORCE_POINTER_SIZE |
#elif defined(__x86_64__) |
enum target_cpu target_cpu = CPU_x86_64; |
+#define FORCE_POINTER_SIZE |
#elif defined(__sparc__) |
enum target_cpu target_cpu = CPU_SPARC; |
#elif defined(__ALPHA__) |
@@ -574,6 +577,10 @@ |
signal( SIGTERM, exit_on_signal ); |
signal( SIGINT, exit_on_signal ); |
|
+#ifdef FORCE_POINTER_SIZE |
+ force_pointer_size = sizeof(size_t); |
+#endif |
+ |
output_file = stdout; |
argv = parse_options( argc, argv, spec ); |
|