Re: Anyone building Emacs trunk with MinGW w64 (32 bits)

[Eli Zaretskii]

> From: address@hidden
> Date: Tue, 26 Mar 2013 22:52:15 +0900
> 
> > I'm trying to build by mingw-w64 at Cygwin.
> 
> I succeed to bootstrap mingw-w64 emacs (32bit and 64bit) by
> the changes (for trunk r112139) attached to this mail on Cygwin
> at Windows7 64bit.

Thanks.  But what does it mean "on Cygwin" in this context?  If you
are building with the MinGW64 tools, what Cygwin has got to do with
this?

> I'm not sure that this changes is correct, but I hope that this
> will help you.

They are helpful, but I have a few questions:

  --- ./nt/addpm.c.orig 2013-03-26 17:33:23.000000000 +0900
  +++ ./nt/addpm.c      2013-03-26 21:46:23.405698700 +0900
  @@ -34,15 +34,17 @@
      installed, then the DDE fallback for creating icons the Windows 3.1
      progman way will be used instead, but that is prone to lockups
      caused by other applications not servicing their message queues.  */
  -/* MinGW64 defines _W64 and barfs if _WIN32_IE is defined to anything
  -   below 0x500.  */
  -#ifndef _W64
   #define _WIN32_IE 0x400
  -#endif
   /* Request C Object macros for COM interfaces.  */
   #define COBJMACROS 1

   #include <windows.h>
  +/* MinGW64 defines _W64 and barfs if _WIN32_IE is defined to anything
  +   below 0x500.  */
  +#ifdef _W64
  +#undef _WIN32_IE
  +#define _WIN32_IE 0x500
  +#endif

What was wrong with the original code, and why did you need to move
the definition of _WIN32_IE further down?  What error messages did you
see with the original code?

  --- ./nt/configure.bat.orig   2013-03-26 22:06:16.528698700 +0900
  +++ ./nt/configure.bat        2013-03-26 22:06:16.492698700 +0900
  @@ -479,10 +479,10 @@
   echo Using 'gcc'
   rm -f junk.c junk.o
   Rem It is not clear what GCC version began supporting -mtune
  -Rem and pentium4 on x86, so check this explicitly.
  +Rem and i686 on x86, so check this explicitly.
   echo main(){} >junk.c
  -echo gcc -c -O2 -mtune=pentium4 junk.c >>config.log
  -gcc -c -O2 -mtune=pentium4 junk.c >>config.log 2>&1
  +echo gcc -c -O2 -mtune=i686 junk.c >>config.log
  +gcc -c -O2 -mtune=i686 junk.c >>config.log 2>&1

What was wrong with the original gcc commands?

  #ifdef _W64
  /* MinGW64 specific stuff.  */
 -#define USE_NO_MINGW_SETJMP_TWO_ARGS 1
  /* Make sure 'struct timespec' and 'struct timezone' are defined.  */
  #include <sys/types.h>
 +#include <sys/stat.h>
  #include <time.h>
 +#ifdef WIN64
 +#define _start __start
 +#endif
  #endif

  #ifdef _MSC_VER

Please explain why these changes to ms-w32.h were needed.

  --- ./nt/inc/sys/time.h.orig  2013-03-26 17:33:23.000000000 +0900
  +++ ./nt/inc/sys/time.h       2013-03-26 21:46:23.425698700 +0900
  @@ -8,7 +8,8 @@

   /* The guards are for MinGW64, which defines these structs on its
      system headers which are included by ms-w32.h.  */
  -#ifndef _W64
  +#if !defined(_TIMEVAL_DEFINED) || !defined(_W64)
  +#define _TIMEVAL_DEFINED
   struct timeval
   {
     long               tv_sec;         /* seconds */

This breaks the MinGW32 build, so please see if the current trunk has
a better solution for this problem.

    --- ./src/image.c.orig      2013-03-24 18:16:45.000000000 +0900
    +++ ./src/image.c   2013-03-26 21:46:23.437698700 +0900
    @@ -5545,6 +5545,9 @@
       png_byte **rows;
     };

    +#ifdef _W64
    +#define _setjmp setjmp
    +#endif

Why is this needed?

  --- ./src/lisp.h.orig 2013-03-25 12:31:37.000000000 +0900
  +++ ./src/lisp.h      2013-03-26 21:46:23.442698700 +0900
  @@ -2164,7 +2164,11 @@

   #ifdef HAVE__SETJMP
   typedef jmp_buf sys_jmp_buf;
  +#ifdef _W64
  +# define sys_setjmp(j) setjmp (j)
  +#else
   # define sys_setjmp(j) _setjmp (j)
  +#endif
   # define sys_longjmp(j, v) _longjmp (j, v)

And this?

Thanks.