emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r115976: Fix minor build problems related to MinGW64


From: Eli Zaretskii
Subject: [Emacs-diffs] trunk r115976: Fix minor build problems related to MinGW64.
Date: Sat, 11 Jan 2014 13:37:29 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 115976
revision-id: address@hidden
parent: address@hidden
author: Fabrice Popineau <address@hidden>
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2014-01-11 15:36:06 +0200
message:
  Fix minor build problems related to MinGW64.
  
   configure.ac: Read $srcdir/nt/mingw-cfg.site when $MSYSTEM is
   "MINGW64" as well.
  
   nt/inc/ms-w32.h (pthread_sigmask): Undefine if defined, for MinGW64.
  
   src/unexw32.c (_start) [__MINGW64__]: Define to __start.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  nt/ChangeLog                   changelog-20091113204419-o5vbwnq5f7feedwu-1545
  nt/inc/ms-w32.h                msw32.h-20091113204419-o5vbwnq5f7feedwu-807
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/unexw32.c                  unexw32.c-20091113204419-o5vbwnq5f7feedwu-887
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-01-11 07:01:30 +0000
+++ b/ChangeLog 2014-01-11 13:36:06 +0000
@@ -1,3 +1,8 @@
+2014-01-11  Fabrice Popineau  <address@hidden>
+
+       * configure.ac: Read $srcdir/nt/mingw-cfg.site when $MSYSTEM is
+       "MINGW64" as well.
+
 2014-01-11  Paul Eggert  <address@hidden>
 
        Merge from gnulib, incorporating:

=== modified file 'configure.ac'
--- a/configure.ac      2014-01-09 00:10:07 +0000
+++ b/configure.ac      2014-01-11 13:36:06 +0000
@@ -24,7 +24,8 @@
 AC_PREREQ(2.65)
 AC_INIT(emacs, 24.3.50)
 
-if test "x$MSYSTEM" = "xMINGW32"
+dnl We get MINGW64 with MSYS2
+if test "x$MSYSTEM" = "xMINGW32" -o "x$MSYSTEM" = "xMINGW64"
 then
   . $srcdir/nt/mingw-cfg.site
 

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2014-01-11 03:55:50 +0000
+++ b/nt/ChangeLog      2014-01-11 13:36:06 +0000
@@ -1,3 +1,7 @@
+2014-01-11  Fabrice Popineau  <address@hidden>
+
+       * inc/ms-w32.h (pthread_sigmask): Undefine if defined, for MinGW64.
+
 2013-12-31  Fabrice Popineau  <address@hidden>
 
        * inc/ms-w32.h (sys_kill): Fix prototype.

=== modified file 'nt/inc/ms-w32.h'
--- a/nt/inc/ms-w32.h   2014-01-01 07:43:34 +0000
+++ b/nt/inc/ms-w32.h   2014-01-11 13:36:06 +0000
@@ -388,6 +388,11 @@
 extern int sigaddset (sigset_t *, int);
 extern int sigfillset (sigset_t *);
 extern int sigprocmask (int, const sigset_t *, sigset_t *);
+/* MinGW64 defines pthread_sigmask as zero in its pthread_signal.h
+   header, but we have an implementation for that function in w32proc.c.  */
+#ifdef pthread_sigmask
+#undef pthread_sigmask
+#endif
 extern int pthread_sigmask (int, const sigset_t *, sigset_t *);
 extern int sigismember (const sigset_t *, int);
 extern int setpgrp (int, int);

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-01-11 11:54:08 +0000
+++ b/src/ChangeLog     2014-01-11 13:36:06 +0000
@@ -1,3 +1,7 @@
+2014-01-11  Fabrice Popineau  <address@hidden>
+
+       * unexw32.c (_start) [__MINGW64__]: Define to __start.
+
 2014-01-11  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (try_window_id): Don't use this function's optimizations

=== modified file 'src/unexw32.c'
--- a/src/unexw32.c     2014-01-01 07:43:34 +0000
+++ b/src/unexw32.c     2014-01-11 13:36:06 +0000
@@ -85,6 +85,13 @@
 
 PIMAGE_SECTION_HEADER heap_section;
 
+/* MinGW64 doesn't add a leading underscore to external symbols,
+   whereas configure.ac sets up LD_SWITCH_SYSTEM_TEMACS to force the
+   entry point at __start, with two underscores.  */
+#ifdef __MINGW64__
+#define _start __start
+#endif
+
 /* Startup code for running on NT.  When we are running as the dumped
    version, we need to bootstrap our heap and .bss section into our
    address space before we can actually hand off control to the startup


reply via email to

[Prev in Thread] Current Thread [Next in Thread]