app-emulation/wine/files/wine-1.1.15-winegcc.patch

   1 http://bugs.gentoo.org/260726
   2
   3 --- wine-1.1.15/tools/winegcc/winegcc.c
   4 +++ wine-1.1.15/tools/winegcc/winegcc.c
   5 @@ -215,10 +215,13 @@
   6      strarray* files;
   7  };
   8
   9 +#undef FORCE_POINTER_SIZE
  10  #ifdef __i386__
  11  static const enum target_cpu build_cpu = CPU_x86;
  12 +#define FORCE_POINTER_SIZE
  13  #elif defined(__x86_64__)
  14  static const enum target_cpu build_cpu = CPU_x86_64;
  15 +#define FORCE_POINTER_SIZE
  16  #elif defined(__sparc__)
  17  static const enum target_cpu build_cpu = CPU_SPARC;
  18  #elif defined(__ALPHA__)
  19 @@ -968,6 +971,9 @@
  20      opts.linker_args = strarray_alloc();
  21      opts.compiler_args = strarray_alloc();
  22      opts.winebuild_args = strarray_alloc();
  23 +#ifdef FORCE_POINTER_SIZE
  24 +    opts.force_pointer_size = sizeof(size_t);
  25 +#endif
  26
  27      /* determine the processor type */
  28      if (strendswith(argv[0], "winecpp")) opts.processor = proc_cpp;
  29 --- wine-1.1.15/tools/winebuild/main.c
  30 +++ wine-1.1.15/tools/winebuild/main.c
  31 @@ -50,10 +50,13 @@
  32  int link_ext_symbols = 0;
  33  int force_pointer_size = 0;
  34
  35 +#undef FORCE_POINTER_SIZE
  36  #ifdef __i386__
  37  enum target_cpu target_cpu = CPU_x86;
  38 +#define FORCE_POINTER_SIZE
  39  #elif defined(__x86_64__)
  40  enum target_cpu target_cpu = CPU_x86_64;
  41 +#define FORCE_POINTER_SIZE
  42  #elif defined(__sparc__)
  43  enum target_cpu target_cpu = CPU_SPARC;
  44  #elif defined(__ALPHA__)
  45 @@ -574,6 +577,10 @@
  46      signal( SIGTERM, exit_on_signal );
  47      signal( SIGINT, exit_on_signal );
  48
  49 +#ifdef FORCE_POINTER_SIZE
  50 +    force_pointer_size = sizeof(size_t);
  51 +#endif
  52 +
  53      output_file = stdout;
  54      argv = parse_options( argc, argv, spec );
  55