Skip to content

Update MinGW-w64 to 3839e21b08807479a31d5a9764666f82ae2f0356 #22999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 25, 2025
Merged

Update MinGW-w64 to 3839e21b08807479a31d5a9764666f82ae2f0356 #22999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2404e7f
update_mingw: Add update logic for winpthreads files.
alexrp Feb 24, 2025
ed10a5d
mingw: Update MinGW-w64 headers to 3839e21b08807479a31d5a9764666f82ae…
alexrp Feb 24, 2025
8afe928
mingw: Update MinGW-w64 sources to 3839e21b08807479a31d5a9764666f82ae…
alexrp Feb 24, 2025
51b44be
std.zig.target: Support new wiaguid library name for MinGW-w64.
alexrp Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 13 additions & 9 deletions lib/libc/include/any-windows-any/_mingw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,10 @@ limitations in handling dllimport attribute. */
# endif
#endif

#if !defined(__CRTDLL__) && __MSVCRT_VERSION__ == 0x00
#define __CRTDLL__
#endif

#if !defined(_UCRT) && ((__MSVCRT_VERSION__ >= 0x1400) || (__MSVCRT_VERSION__ >= 0xE00 && __MSVCRT_VERSION__ < 0x1000))
/* Allow both 0x1400 and 0xE00 to identify UCRT */
#define _UCRT
Expand Down Expand Up @@ -594,12 +598,12 @@ extern "C" {
void __cdecl __debugbreak(void);
__MINGW_INTRIN_INLINE void __cdecl __debugbreak(void)
{
#if defined(__i386__) || defined(__x86_64__)
#if defined(__aarch64__) || defined(__arm64ec__)
__asm__ __volatile__("brk #0xf000");
#elif defined(__i386__) || defined(__x86_64__)
__asm__ __volatile__("int {$}3":);
#elif defined(__arm__)
__asm__ __volatile__("udf #0xfe");
#elif defined(__aarch64__)
__asm__ __volatile__("brk #0xf000");
#else
__asm__ __volatile__("unimplemented");
#endif
Expand All @@ -615,14 +619,14 @@ __MINGW_INTRIN_INLINE void __cdecl __debugbreak(void)
void __cdecl __MINGW_ATTRIB_NORETURN __fastfail(unsigned int code);
__MINGW_INTRIN_INLINE void __cdecl __MINGW_ATTRIB_NORETURN __fastfail(unsigned int code)
{
#if defined(__i386__) || defined(__x86_64__)
#if defined(__aarch64__) || defined(__arm64ec__)
register unsigned int w0 __asm__("w0") = code;
__asm__ __volatile__("brk #0xf003"::"r"(w0));
#elif defined(__i386__) || defined(__x86_64__)
__asm__ __volatile__("int {$}0x29"::"c"(code));
#elif defined(__arm__)
register unsigned int r0 __asm__("r0") = code;
__asm__ __volatile__("udf #0xfb"::"r"(r0));
#elif defined(__aarch64__)
register unsigned int w0 __asm__("w0") = code;
__asm__ __volatile__("brk #0xf003"::"r"(w0));
#else
__asm__ __volatile__("unimplemented");
#endif
Expand All @@ -636,13 +640,13 @@ __MINGW_INTRIN_INLINE void __cdecl __MINGW_ATTRIB_NORETURN __fastfail(unsigned i
#define __MINGW_PREFETCH_IMPL 1
#endif
#if __MINGW_PREFETCH_IMPL == 1
#if defined(__arm__) || defined(__aarch64__)
#if defined(__arm__) || defined(__aarch64__) || defined(__arm64ec__)
void __cdecl __prefetch(const void *addr);
__MINGW_INTRIN_INLINE void __cdecl __prefetch(const void *addr)
{
#if defined(__arm__)
__asm__ __volatile__("pld [%0]"::"r"(addr));
#elif defined(__aarch64__)
#elif defined(__aarch64__) || defined(__arm64ec__)
__asm__ __volatile__("prfm pldl1keep, [%0]"::"r"(addr));
#endif
}
Expand Down
22 changes: 16 additions & 6 deletions lib/libc/include/any-windows-any/_mingw_mac.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
#ifndef _INC_CRTDEFS_MACRO
#define _INC_CRTDEFS_MACRO

#define __MINGW64_PASTE2(x, y) x ## y
#define __MINGW64_PASTE(x, y) __MINGW64_PASTE2(x, y)

#define __STRINGIFY(x) #x
#define __MINGW64_STRINGIFY(x) \
__STRINGIFY(x)
Expand Down Expand Up @@ -88,6 +91,13 @@
# endif
#endif

#if defined(__arm64ec__) && !defined(_M_ARM64EC)
# define _M_ARM64EC 1
# ifndef _ARM64EC_
# define _ARM64EC_ 1
# endif
#endif

#ifndef _X86_
/* MS does not prefix symbols by underscores for 64-bit. */
# ifndef __MINGW_USE_UNDERSCORE_PREFIX
Expand Down Expand Up @@ -116,14 +126,14 @@
#endif /* ifndef _X86_ */

#if __MINGW_USE_UNDERSCORE_PREFIX == 0
# define __MINGW_IMP_SYMBOL(sym) __imp_##sym
# define __MINGW_IMP_LSYMBOL(sym) __imp_##sym
# define __MINGW_IMP_SYMBOL(sym) __MINGW64_PASTE(__imp_,sym)
# define __MINGW_IMP_LSYMBOL(sym) __MINGW64_PASTE(__imp_,sym)
# define __MINGW_USYMBOL(sym) sym
# define __MINGW_LSYMBOL(sym) _##sym
# define __MINGW_LSYMBOL(sym) __MINGW64_PASTE(_,sym)
#else /* ! if __MINGW_USE_UNDERSCORE_PREFIX == 0 */
# define __MINGW_IMP_SYMBOL(sym) _imp__##sym
# define __MINGW_IMP_LSYMBOL(sym) __imp__##sym
# define __MINGW_USYMBOL(sym) _##sym
# define __MINGW_IMP_SYMBOL(sym) __MINGW64_PASTE(_imp__,sym)
# define __MINGW_IMP_LSYMBOL(sym) __MINGW64_PASTE(__imp__,sym)
# define __MINGW_USYMBOL(sym) __MINGW64_PASTE(_,sym)
# define __MINGW_LSYMBOL(sym) sym
#endif /* if __MINGW_USE_UNDERSCORE_PREFIX == 0 */

Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/activation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/activation.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/activation.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/activaut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/activaut.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/activaut.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/activdbg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/activdbg.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/activdbg.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/activdbg100.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/activdbg100.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/activdbg100.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/activprof.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/activprof.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/activprof.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/activscp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/activscp.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/activscp.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/adhoc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/adhoc.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/adhoc.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/alg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/alg.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/alg.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/amstream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/amstream.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/amstream.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/amvideo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/amvideo.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/amvideo.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/asyncinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/asyncinfo.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/asyncinfo.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/audioclient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/audioclient.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/audioclient.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/audioendpoints.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/audioendpoints.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/audioendpoints.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/audiopolicy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/audiopolicy.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/audiopolicy.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/austream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/austream.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/austream.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/bdaiface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/bdaiface.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/bdaiface.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/bits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/bits.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/bits.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/bits1_5.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/bits1_5.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/bits1_5.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/bits2_0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/bits2_0.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/bits2_0.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/bits2_5.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/bits2_5.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/bits2_5.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/bits3_0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/bits3_0.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/bits3_0.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/bits5_0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/bits5_0.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/bits5_0.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/comadmin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/comadmin.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/comadmin.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
11 changes: 11 additions & 0 deletions lib/libc/include/any-windows-any/combaseapi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,17 @@ WINOLEAPI CoGetTreatAsClass (REFCLSID clsidOld, LPCLSID pClsidNew);
WINOLEAPI CoInvalidateRemoteMachineBindings (LPOLESTR pszMachineName);
#endif

#if (NTDDI_VERSION >= NTDDI_WINBLUE)
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
enum AgileReferenceOptions {
AGILEREFERENCE_DEFAULT = 0,
AGILEREFERENCE_DELAYEDMARSHAL = 1
};

WINOLEAPI RoGetAgileReference(enum AgileReferenceOptions options, REFIID riid, IUnknown *pUnk, IAgileReference **ppAgileReference);
#endif
#endif

#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP)
typedef HRESULT (STDAPICALLTYPE *LPFNGETCLASSOBJECT) (REFCLSID, REFIID, LPVOID *);
typedef HRESULT (STDAPICALLTYPE *LPFNCANUNLOADNOW) (void);
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/comcat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/comcat.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/comcat.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/include/any-windows-any/commoncontrols.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 9.20 from include/commoncontrols.idl - Do not edit ***/
/*** Autogenerated by WIDL 10.0-rc1 from include/commoncontrols.idl - Do not edit ***/

#ifdef _WIN32
#ifndef __REQUIRED_RPCNDR_H_VERSION__
Expand Down
Loading
Loading