Commit 2b610bbf authored by David Major's avatar David Major
Browse files

Bug 1681123 - Bump mingw-w64 revision to fix _aligned_malloc in clang 12. r=tjr, a=RyanVM 

clang 12 (specifically https://reviews.llvm.org/D91379) made some refactorings to libc++ that exposed a problem in the MinGW headers. That has now been fixed upstream.

In the meantime the headers also gained definitions for ProcessPayloadRestrictionPolicy, so we can remove our workaround for that.

Differential Revision: https://phabricator.services.mozilla.com/D98945
parent d6f1ea64

mozglue/misc/WindowsProcessMitigations.cpp

+0 −28
Original line number Diff line number Diff line
@@ -15,34 +15,6 @@ BOOL WINAPI GetProcessMitigationPolicy( 
    SIZE_T dwLength);

#endif  // (_WIN32_WINNT < 0x0602)



// MinGW does not have these definitions in winnt.h yet

#if defined(__MINGW32__)

constexpr PROCESS_MITIGATION_POLICY ProcessPayloadRestrictionPolicy =

    static_cast<PROCESS_MITIGATION_POLICY>(12);



typedef struct _PROCESS_MITIGATION_PAYLOAD_RESTRICTION_POLICY {

  union {

    DWORD Flags;

    struct {

      DWORD EnableExportAddressFilter : 1;

      DWORD AuditExportAddressFilter : 1;

      DWORD EnableExportAddressFilterPlus : 1;

      DWORD AuditExportAddressFilterPlus : 1;

      DWORD EnableImportAddressFilter : 1;

      DWORD AuditImportAddressFilter : 1;

      DWORD EnableRopStackPivot : 1;

      DWORD AuditRopStackPivot : 1;

      DWORD EnableRopCallerCheck : 1;

      DWORD AuditRopCallerCheck : 1;

      DWORD EnableRopSimExec : 1;

      DWORD AuditRopSimExec : 1;

      DWORD ReservedFlags : 20;

    } DUMMYSTRUCTNAME;

  } DUMMYUNIONNAME;

} PROCESS_MITIGATION_PAYLOAD_RESTRICTION_POLICY,

    *PPROCESS_MITIGATION_PAYLOAD_RESTRICTION_POLICY;

#endif  // defined(__MINGW32__)



namespace mozilla {



static decltype(&::GetProcessMitigationPolicy)

taskcluster/ci/fetch/toolchains.yml

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ mingw-w64: 
    fetch:

        type: git

        repo: https://git.code.sf.net/p/mingw-w64/mingw-w64

        revision: bd8ca6c303658659496d0c440cf9f2baa8f7a5f0

        revision: 660e09f3cb20f181b6d6435cb623d65a3922a063



libunwind:

    description: libunwind source code