Skip to content

Commit ed10a5d

Browse files
committed
mingw: Update MinGW-w64 headers to 3839e21b08807479a31d5a9764666f82ae2f0356.
1 parent 2404e7f commit ed10a5d

File tree

272 files changed

+6025
-2143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

272 files changed

+6025
-2143
lines changed

lib/libc/include/any-windows-any/_mingw.h

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,10 @@ limitations in handling dllimport attribute. */
237237
# endif
238238
#endif
239239

240+
#if !defined(__CRTDLL__) && __MSVCRT_VERSION__ == 0x00
241+
#define __CRTDLL__
242+
#endif
243+
240244
#if !defined(_UCRT) && ((__MSVCRT_VERSION__ >= 0x1400) || (__MSVCRT_VERSION__ >= 0xE00 && __MSVCRT_VERSION__ < 0x1000))
241245
/* Allow both 0x1400 and 0xE00 to identify UCRT */
242246
#define _UCRT
@@ -594,12 +598,12 @@ extern "C" {
594598
void __cdecl __debugbreak(void);
595599
__MINGW_INTRIN_INLINE void __cdecl __debugbreak(void)
596600
{
597-
#if defined(__i386__) || defined(__x86_64__)
601+
#if defined(__aarch64__) || defined(__arm64ec__)
602+
__asm__ __volatile__("brk #0xf000");
603+
#elif defined(__i386__) || defined(__x86_64__)
598604
__asm__ __volatile__("int {$}3":);
599605
#elif defined(__arm__)
600606
__asm__ __volatile__("udf #0xfe");
601-
#elif defined(__aarch64__)
602-
__asm__ __volatile__("brk #0xf000");
603607
#else
604608
__asm__ __volatile__("unimplemented");
605609
#endif
@@ -615,14 +619,14 @@ __MINGW_INTRIN_INLINE void __cdecl __debugbreak(void)
615619
void __cdecl __MINGW_ATTRIB_NORETURN __fastfail(unsigned int code);
616620
__MINGW_INTRIN_INLINE void __cdecl __MINGW_ATTRIB_NORETURN __fastfail(unsigned int code)
617621
{
618-
#if defined(__i386__) || defined(__x86_64__)
622+
#if defined(__aarch64__) || defined(__arm64ec__)
623+
register unsigned int w0 __asm__("w0") = code;
624+
__asm__ __volatile__("brk #0xf003"::"r"(w0));
625+
#elif defined(__i386__) || defined(__x86_64__)
619626
__asm__ __volatile__("int {$}0x29"::"c"(code));
620627
#elif defined(__arm__)
621628
register unsigned int r0 __asm__("r0") = code;
622629
__asm__ __volatile__("udf #0xfb"::"r"(r0));
623-
#elif defined(__aarch64__)
624-
register unsigned int w0 __asm__("w0") = code;
625-
__asm__ __volatile__("brk #0xf003"::"r"(w0));
626630
#else
627631
__asm__ __volatile__("unimplemented");
628632
#endif
@@ -636,13 +640,13 @@ __MINGW_INTRIN_INLINE void __cdecl __MINGW_ATTRIB_NORETURN __fastfail(unsigned i
636640
#define __MINGW_PREFETCH_IMPL 1
637641
#endif
638642
#if __MINGW_PREFETCH_IMPL == 1
639-
#if defined(__arm__) || defined(__aarch64__)
643+
#if defined(__arm__) || defined(__aarch64__) || defined(__arm64ec__)
640644
void __cdecl __prefetch(const void *addr);
641645
__MINGW_INTRIN_INLINE void __cdecl __prefetch(const void *addr)
642646
{
643647
#if defined(__arm__)
644648
__asm__ __volatile__("pld [%0]"::"r"(addr));
645-
#elif defined(__aarch64__)
649+
#elif defined(__aarch64__) || defined(__arm64ec__)
646650
__asm__ __volatile__("prfm pldl1keep, [%0]"::"r"(addr));
647651
#endif
648652
}

lib/libc/include/any-windows-any/_mingw_mac.h

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
#ifndef _INC_CRTDEFS_MACRO
88
#define _INC_CRTDEFS_MACRO
99

10+
#define __MINGW64_PASTE2(x, y) x ## y
11+
#define __MINGW64_PASTE(x, y) __MINGW64_PASTE2(x, y)
12+
1013
#define __STRINGIFY(x) #x
1114
#define __MINGW64_STRINGIFY(x) \
1215
__STRINGIFY(x)
@@ -88,6 +91,13 @@
8891
# endif
8992
#endif
9093

94+
#if defined(__arm64ec__) && !defined(_M_ARM64EC)
95+
# define _M_ARM64EC 1
96+
# ifndef _ARM64EC_
97+
# define _ARM64EC_ 1
98+
# endif
99+
#endif
100+
91101
#ifndef _X86_
92102
/* MS does not prefix symbols by underscores for 64-bit. */
93103
# ifndef __MINGW_USE_UNDERSCORE_PREFIX
@@ -116,14 +126,14 @@
116126
#endif /* ifndef _X86_ */
117127

118128
#if __MINGW_USE_UNDERSCORE_PREFIX == 0
119-
# define __MINGW_IMP_SYMBOL(sym) __imp_##sym
120-
# define __MINGW_IMP_LSYMBOL(sym) __imp_##sym
129+
# define __MINGW_IMP_SYMBOL(sym) __MINGW64_PASTE(__imp_,sym)
130+
# define __MINGW_IMP_LSYMBOL(sym) __MINGW64_PASTE(__imp_,sym)
121131
# define __MINGW_USYMBOL(sym) sym
122-
# define __MINGW_LSYMBOL(sym) _##sym
132+
# define __MINGW_LSYMBOL(sym) __MINGW64_PASTE(_,sym)
123133
#else /* ! if __MINGW_USE_UNDERSCORE_PREFIX == 0 */
124-
# define __MINGW_IMP_SYMBOL(sym) _imp__##sym
125-
# define __MINGW_IMP_LSYMBOL(sym) __imp__##sym
126-
# define __MINGW_USYMBOL(sym) _##sym
134+
# define __MINGW_IMP_SYMBOL(sym) __MINGW64_PASTE(_imp__,sym)
135+
# define __MINGW_IMP_LSYMBOL(sym) __MINGW64_PASTE(__imp__,sym)
136+
# define __MINGW_USYMBOL(sym) __MINGW64_PASTE(_,sym)
127137
# define __MINGW_LSYMBOL(sym) sym
128138
#endif /* if __MINGW_USE_UNDERSCORE_PREFIX == 0 */
129139

lib/libc/include/any-windows-any/activation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*** Autogenerated by WIDL 9.20 from include/activation.idl - Do not edit ***/
1+
/*** Autogenerated by WIDL 10.0-rc1 from include/activation.idl - Do not edit ***/
22

33
#ifdef _WIN32
44
#ifndef __REQUIRED_RPCNDR_H_VERSION__

lib/libc/include/any-windows-any/activaut.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*** Autogenerated by WIDL 9.20 from include/activaut.idl - Do not edit ***/
1+
/*** Autogenerated by WIDL 10.0-rc1 from include/activaut.idl - Do not edit ***/
22

33
#ifdef _WIN32
44
#ifndef __REQUIRED_RPCNDR_H_VERSION__

lib/libc/include/any-windows-any/activdbg.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*** Autogenerated by WIDL 9.20 from include/activdbg.idl - Do not edit ***/
1+
/*** Autogenerated by WIDL 10.0-rc1 from include/activdbg.idl - Do not edit ***/
22

33
#ifdef _WIN32
44
#ifndef __REQUIRED_RPCNDR_H_VERSION__

lib/libc/include/any-windows-any/activdbg100.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*** Autogenerated by WIDL 9.20 from include/activdbg100.idl - Do not edit ***/
1+
/*** Autogenerated by WIDL 10.0-rc1 from include/activdbg100.idl - Do not edit ***/
22

33
#ifdef _WIN32
44
#ifndef __REQUIRED_RPCNDR_H_VERSION__

lib/libc/include/any-windows-any/activprof.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*** Autogenerated by WIDL 9.20 from include/activprof.idl - Do not edit ***/
1+
/*** Autogenerated by WIDL 10.0-rc1 from include/activprof.idl - Do not edit ***/
22

33
#ifdef _WIN32
44
#ifndef __REQUIRED_RPCNDR_H_VERSION__

lib/libc/include/any-windows-any/activscp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*** Autogenerated by WIDL 9.20 from include/activscp.idl - Do not edit ***/
1+
/*** Autogenerated by WIDL 10.0-rc1 from include/activscp.idl - Do not edit ***/
22

33
#ifdef _WIN32
44
#ifndef __REQUIRED_RPCNDR_H_VERSION__

lib/libc/include/any-windows-any/adhoc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*** Autogenerated by WIDL 9.20 from include/adhoc.idl - Do not edit ***/
1+
/*** Autogenerated by WIDL 10.0-rc1 from include/adhoc.idl - Do not edit ***/
22

33
#ifdef _WIN32
44
#ifndef __REQUIRED_RPCNDR_H_VERSION__

lib/libc/include/any-windows-any/alg.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*** Autogenerated by WIDL 9.20 from include/alg.idl - Do not edit ***/
1+
/*** Autogenerated by WIDL 10.0-rc1 from include/alg.idl - Do not edit ***/
22

33
#ifdef _WIN32
44
#ifndef __REQUIRED_RPCNDR_H_VERSION__

0 commit comments

Comments
 (0)