Update mingw-w64 patchset

2016-08-04 16:20:17 +02:00
1 parent 486058c465
commit 0355fd9f4b
@@ -1,95 +1,30 @@
-From df4015f5dff1d2baa8fa3b258ea1c2866d1667a2 Mon Sep 17 00:00:00 2001
+From 5592b70cca64935b0d090fe5030b3110ba17068c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
-Date: Tue, 3 May 2016 17:43:59 +0200
-Subject: [PATCH] crt: Add libruntimeobject to arm lib
+Date: Fri, 13 May 2016 15:17:56 +0200
+Subject: [PATCH] yvals.h: Don't create a _Bool typedef if a macro already
+ exists

 ---
- mingw-w64-crt/Makefile.am                          |  6 ++++++
- .../libarm32/api-ms-win-core-winrt-l1-1-0.def      |  9 ++++++++
- .../api-ms-win-core-winrt-string-l1-1-0.def        | 25 ++++++++++++++++++++++
- mingw-w64-crt/libarm32/runtimeobject.mri           |  5 +++++
- 4 files changed, 45 insertions(+)
- create mode 100644 mingw-w64-crt/libarm32/api-ms-win-core-winrt-l1-1-0.def
- create mode 100644 mingw-w64-crt/libarm32/api-ms-win-core-winrt-string-l1-1-0.def
- create mode 100644 mingw-w64-crt/libarm32/runtimeobject.mri
+ mingw-w64-headers/crt/yvals.h | 2 ++
+ 1 file changed, 2 insertions(+)

-diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
-index daf25b0..aa198bd 100644
--- a/mingw-w64-crt/Makefile.am
-+++ b/mingw-w64-crt/Makefile.am
-@@ -1426,9 +1426,15 @@ libarm32/libvfw32.a: libarm32/vfw32.mri libarm32/libmsvfw32.a libarm32/libavifil
- 	$(AR) -M < $<
- 	$(RANLIB) $@
+diff --git a/mingw-w64-headers/crt/yvals.h b/mingw-w64-headers/crt/yvals.h
+index 70593c4..98b6921 100644
+--- a/mingw-w64-headers/crt/yvals.h
+++ b/mingw-w64-headers/crt/yvals.h
+@@ -163,10 +163,12 @@
+ #define _Restrict __restrict__
 
-+libarm32/libruntimeobject.a: libarm32/runtimeobject.mri libarm32/libapi-ms-win-core-winrt-string-l1-1-0.a libarm32/libapi-ms-win-core-winrt-l1-1-0.a
-+	rm -f $@
-+	$(AR) -M < $<
-+	$(RANLIB) $@
-+
- dx32_DATA =
- dx32_DATA += libarm32/libxinput.a
- dx32_DATA += libarm32/libd3dcompiler.a
-+libarm32_DATA += libarm32/libruntimeobject.a
+ #ifdef __cplusplus
+#ifndef _Bool
+ _STD_BEGIN
+ typedef bool _Bool;
+ _STD_END
+ #endif
+#endif
 
- libarm32/libxinput.a: libarm32/xinput1_4.def
- 	$(DTDEFARM32) $<
-diff --git a/mingw-w64-crt/libarm32/api-ms-win-core-winrt-l1-1-0.def b/mingw-w64-crt/libarm32/api-ms-win-core-winrt-l1-1-0.def
-new file mode 100644
-index 0000000..3c66e9b
--- /dev/null
-+++ b/mingw-w64-crt/libarm32/api-ms-win-core-winrt-l1-1-0.def
-@@ -0,0 +1,9 @@
-+LIBRARY "api-ms-win-core-winrt-l1-1-0.dll"
-+EXPORTS
-+RoActivateInstance@8
-+RoGetActivationFactory@12
-+RoGetApartmentIdentifier@4
-+RoInitialize@4
-+RoRegisterActivationFactories@16
-+RoRevokeActivationFactories@4
-+RoUninitialize
-diff --git a/mingw-w64-crt/libarm32/api-ms-win-core-winrt-string-l1-1-0.def b/mingw-w64-crt/libarm32/api-ms-win-core-winrt-string-l1-1-0.def
-new file mode 100644
-index 0000000..c49fc51
--- /dev/null
-+++ b/mingw-w64-crt/libarm32/api-ms-win-core-winrt-string-l1-1-0.def
-@@ -0,0 +1,25 @@
-+LIBRARY "api-ms-win-core-winrt-string-l1-1-0.dll"
-+EXPORTS
-+HSTRING_UserFree@8
-+HSTRING_UserMarshal@12
-+HSTRING_UserSize@12
-+HSTRING_UserUnmarshal@12
-+WindowsCompareStringOrdinal@12
-+WindowsConcatString@12
-+WindowsCreateString@12
-+WindowsCreateStringReference@16
-+WindowsDeleteString@4
-+WindowsDeleteStringBuffer@4
-+WindowsDuplicateString@8
-+WindowsGetStringLen@4
-+WindowsGetStringRawBuffer@8
-+WindowsInspectString@24
-+WindowsIsStringEmpty@4
-+WindowsPreallocateStringBuffer@12
-+WindowsPromoteStringBuffer@8
-+WindowsReplaceString@16
-+WindowsStringHasEmbeddedNull@8
-+WindowsSubstring@12
-+WindowsSubstringWithSpecifiedLength@16
-+WindowsTrimStringEnd@12
-+WindowsTrimStringStart@12
-diff --git a/mingw-w64-crt/libarm32/runtimeobject.mri b/mingw-w64-crt/libarm32/runtimeobject.mri
-new file mode 100644
-index 0000000..73c6bce
--- /dev/null
-+++ b/mingw-w64-crt/libarm32/runtimeobject.mri
-@@ -0,0 +1,5 @@
-+CREATE libarm32/libruntimeobject.a
-+ADDLIB libarm32/libapi-ms-win-core-winrt-string-l1-1-0.a
-+ADDLIB libarm32/libapi-ms-win-core-winrt-l1-1-0.a
-+SAVE
-+END
+ #define _LONGLONG /* __MINGW_EXTENSION */ __int64
+ #define _ULONGLONG /* __MINGW_EXTENSION */ unsigned __int64
 -- 
 2.8.1