-
Notifications
You must be signed in to change notification settings - Fork 240
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
149 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| diff --git a/compat/win32/trace2_win32_process_info.c b/compat/win32/trace2_win32_process_info.c | ||
| index a4e33768f4..438af8f818 100644 | ||
| --- a/compat/win32/trace2_win32_process_info.c | ||
| +++ b/compat/win32/trace2_win32_process_info.c | ||
| @@ -3,8 +3,8 @@ | ||
| #include "../../repository.h" | ||
| #include "../../trace2.h" | ||
| #include "lazyload.h" | ||
| -#include <Psapi.h> | ||
| -#include <tlHelp32.h> | ||
| +#include <psapi.h> | ||
| +#include <tlhelp32.h> | ||
|
|
||
| /* | ||
| * An arbitrarily chosen value to limit the size of the ancestor | ||
| diff --git a/config.mak.uname b/config.mak.uname | ||
| index 64c44db805..0dd2b673f2 100644 | ||
| --- a/config.mak.uname | ||
| +++ b/config.mak.uname | ||
| @@ -4,7 +4,7 @@ | ||
| # Microsoft's Safe Exception Handling in libraries (such as zlib). | ||
| # Typically required for VS2013+/32-bit compilation on Vista+ versions. | ||
|
|
||
| -uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') | ||
| +uname_S := MINGW | ||
| uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') | ||
| uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') | ||
| uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') | ||
| @@ -677,7 +677,7 @@ ifeq ($(uname_S),MINGW) | ||
| EXTLIBS += -lws2_32 | ||
| GITLIBS += git.res | ||
| PTHREAD_LIBS = | ||
| - RC = windres -O coff | ||
| + RC = $(WINDRES) -O coff | ||
| NATIVE_CRLF = YesPlease | ||
| X = .exe | ||
| # MSys2 | ||
| @@ -689,12 +689,12 @@ ifeq ($(uname_S),MINGW) | ||
| BASIC_LDFLAGS += -Wl,--dynamicbase | ||
| endif | ||
| ifeq (MINGW32,$(MSYSTEM)) | ||
| - prefix = /mingw32 | ||
| + #prefix = /mingw32 | ||
| HOST_CPU = i686 | ||
| BASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup | ||
| endif | ||
| ifeq (MINGW64,$(MSYSTEM)) | ||
| - prefix = /mingw64 | ||
| + #prefix = /mingw64 | ||
| HOST_CPU = x86_64 | ||
| BASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup | ||
| else | ||
| @@ -709,7 +709,7 @@ ifeq ($(uname_S),MINGW) | ||
| INTERNAL_QSORT = YesPlease | ||
| HAVE_LIBCHARSET_H = YesPlease | ||
| USE_GETTEXT_SCHEME = fallthrough | ||
| - USE_LIBPCRE = YesPlease | ||
| + #USE_LIBPCRE = YesPlease | ||
| USE_NED_ALLOCATOR = YesPlease | ||
| ifeq (/mingw64,$(subst 32,64,$(prefix))) | ||
| # Move system config into top-level /etc/ | ||
| diff --git a/wrapper.c b/wrapper.c | ||
| index 67f5f5dbe1..5dc48e815a 100644 | ||
| --- a/wrapper.c | ||
| +++ b/wrapper.c | ||
| @@ -17,7 +17,7 @@ static intmax_t count_fsync_hardware_flush; | ||
| #ifdef HAVE_RTLGENRANDOM | ||
| /* This is required to get access to RtlGenRandom. */ | ||
| #define SystemFunction036 NTAPI SystemFunction036 | ||
| -#include <NTSecAPI.h> | ||
| +#include <ntsecapi.h> | ||
| #undef SystemFunction036 | ||
| #endif | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,48 @@ | ||
| --- a/Dockerfile | ||
| +++ b/Dockerfile | ||
| @@ -65,3 +65,3 @@ COPY src/w64devkit.c src/w64devkit.ico \ | ||
| @@ -74,3 +74,3 @@ COPY src/w64devkit.c src/w64devkit.ico \ | ||
|
|
||
| -ARG ARCH=x86_64-w64-mingw32 | ||
| +ARG ARCH=i686-w64-mingw32 | ||
|
|
||
| @@ -93,2 +93,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \ | ||
| @@ -102,2 +102,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \ | ||
| --with-default-msvcrt=msvcrt-os \ | ||
| + --with-default-win32-winnt=0x0501 \ | ||
| && make -j$(nproc) \ | ||
| @@ -99,2 +100,5 @@ RUN ln -s $ARCH mingw | ||
| @@ -108,2 +109,5 @@ RUN ln -s $ARCH mingw | ||
|
|
||
| +# Disable UTF-8 manifest for Windows XP (#58) | ||
| +RUN echo >/gcc-$GCC_VERSION/gcc/config/i386/winnt-utf8.manifest | ||
| + | ||
| WORKDIR /x-gcc | ||
| @@ -104,2 +108,3 @@ RUN /gcc-$GCC_VERSION/configure \ | ||
| @@ -113,2 +117,3 @@ RUN /gcc-$GCC_VERSION/configure \ | ||
| --target=$ARCH \ | ||
| + --with-arch=pentium4 \ | ||
| --enable-static \ | ||
| @@ -132,4 +137,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \ | ||
| @@ -141,4 +146,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \ | ||
| --disable-dependency-tracking \ | ||
| - --disable-lib32 \ | ||
| - --enable-lib64 \ | ||
| + --enable-lib32 \ | ||
| + --disable-lib64 \ | ||
| CFLAGS="-Os" \ | ||
| @@ -217,2 +222,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \ | ||
| @@ -226,2 +231,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \ | ||
| --with-default-msvcrt=msvcrt-os \ | ||
| + --with-default-win32-winnt=0x0501 \ | ||
| && make -j$(nproc) \ | ||
| @@ -227,4 +233,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \ | ||
| @@ -236,4 +242,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \ | ||
| --disable-dependency-tracking \ | ||
| - --disable-lib32 \ | ||
| - --enable-lib64 \ | ||
| + --enable-lib32 \ | ||
| + --disable-lib64 \ | ||
| CFLAGS="-Os" \ | ||
| @@ -239,2 +245,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-libraries/winpthreads/configure \ | ||
| @@ -248,2 +254,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-libraries/winpthreads/configure \ | ||
| --host=$ARCH \ | ||
| + --with-arch=pentium4 \ | ||
| --enable-static \ | ||
| @@ -512,3 +519,3 @@ RUN cat $PREFIX/src/git-*.patch | patch -p1 \ | ||
| NO_GITWEB=1 \ | ||
| - MSYSTEM=MINGW64 \ | ||
| + MSYSTEM=MINGW32 \ | ||
| CFLAGS="-Os -I/deps/include/" \ |