diff options
| author | Fabrice Popineau | 2014-01-11 15:36:06 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2014-01-11 15:36:06 +0200 |
| commit | e05d3a05bfe8bb14e6f9246d76c7c9134eb101a1 (patch) | |
| tree | a464c39b791b8b8beb9dc1d61730bbd91754aa33 /src | |
| parent | af05bef2d1985fb9bd8485f3084f3bfe282a911f (diff) | |
| download | emacs-e05d3a05bfe8bb14e6f9246d76c7c9134eb101a1.tar.gz emacs-e05d3a05bfe8bb14e6f9246d76c7c9134eb101a1.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/unexw32.c | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 556fcce5fa5..637164281d4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-01-11 Fabrice Popineau <fabrice.popineau@gmail.com> | ||
| 2 | |||
| 3 | * unexw32.c (_start) [__MINGW64__]: Define to __start. | ||
| 4 | |||
| 1 | 2014-01-11 Eli Zaretskii <eliz@gnu.org> | 5 | 2014-01-11 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * xdisp.c (try_window_id): Don't use this function's optimizations | 7 | * xdisp.c (try_window_id): Don't use this function's optimizations |
diff --git a/src/unexw32.c b/src/unexw32.c index 5411cd2a95c..f70cdd79478 100644 --- a/src/unexw32.c +++ b/src/unexw32.c | |||
| @@ -85,6 +85,13 @@ DWORD_PTR extra_bss_size_static = 0; | |||
| 85 | 85 | ||
| 86 | PIMAGE_SECTION_HEADER heap_section; | 86 | PIMAGE_SECTION_HEADER heap_section; |
| 87 | 87 | ||
| 88 | /* MinGW64 doesn't add a leading underscore to external symbols, | ||
| 89 | whereas configure.ac sets up LD_SWITCH_SYSTEM_TEMACS to force the | ||
| 90 | entry point at __start, with two underscores. */ | ||
| 91 | #ifdef __MINGW64__ | ||
| 92 | #define _start __start | ||
| 93 | #endif | ||
| 94 | |||
| 88 | /* Startup code for running on NT. When we are running as the dumped | 95 | /* Startup code for running on NT. When we are running as the dumped |
| 89 | version, we need to bootstrap our heap and .bss section into our | 96 | version, we need to bootstrap our heap and .bss section into our |
| 90 | address space before we can actually hand off control to the startup | 97 | address space before we can actually hand off control to the startup |