Commit: [e-mail] - mingw-wsl-patches (hg)

Mercurial Patch Queue for Windows System Libraries

Commit MetaInfo

• Revision: 68fa70d72cc194805aa9994a9e460ce2f29190c0 (tree)
• Time: 2019-04-24 22:08:07
• Author: Keith Marshall <keith@user...>
• Commiter: Keith Marshall

Log Message

Fix Win64 leading underscore discrepancy; add winnt-page-targets.

Change Summary

Incremental Difference

diff -r 70e595a04113 -r 68fa70d72cc1 cpu-features-x86-64.patch
--- a/cpu-features-x86-64.patch	Sun Apr 21 18:09:02 2019 +0000
+++ b/cpu-features-x86-64.patch	Wed Apr 24 14:08:07 2019 +0100
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent 66b461070c4b063621a1af46c9fbf17323ce536a
+# Parent 1b41be1ec331fc92b2a421a63f69b963bd4b39e1
 # Parent  d1de6110347aee4b3c939b68fcc9de1087c5e9c3
 Make CPU features initialization code x86-64 compliant.
 
@@ -17,7 +17,22 @@
 diff --git a/mingwrt/cpu_features.sx b/mingwrt/cpu_features.sx
 --- a/mingwrt/cpu_features.sx
 +++ b/mingwrt/cpu_features.sx
-@@ -42,8 +42,33 @@
+@@ -3,11 +3,11 @@
+  * Initialization procedure for identification of CPU supported features.
+  *
+  * $Id$
+  *
+  * Written by Keith Marshall <[e-mail]>
+- * Copyright (C) 2017, MinGW.org Project
++ * Copyright (C) 2017, 2019, MinGW.org Project
+  *
+  * Adapted from an original C language implementation.
+  * Written by Danny Smith <[e-mail]>
+  * Copyright (C) 2006, 2008, 2009, MinGW.org Project
+  *
+@@ -40,12 +40,45 @@
+ #define RH_FLAG(BITNUM)		(1 << ((BITNUM) - 8))
+ 
  #define CPUID_FLAG		RX_FLAG(21)	/* EFLAGS bit 21 */
  
  #define FXSAVE_BUFSIZ		       512
@@ -48,12 +63,39 @@
 +#define rbx			ebx
 +#define rsp			esp
 +
++/* Finally, we need to recognize that the _WIN32 compiler prepends an
++ * additional underscore to public symbol names; once again, we adopt
++ * the _WIN64 convention, (which does NOT do this), and adjust public
++ * symbol names accordingly for the 32-bit case.
++ */
++#define __cpu_features_init	___cpu_features_init
++#define __cpu_features		___cpu_features
++
 +#endif	/* !__x86_64__ */
  
  /* FIXME: is this optimization really worthwhile here?  It breaks,
   * with older GAS versions, (such as that commonly deployed in the
-@@ -72,7 +97,11 @@
- ___cpu_features_init:
+  * GCC-3.4.5 era, and earlier)!
+  *
+@@ -60,21 +93,25 @@
+  * overhead to decode the "nop" instruction).
+  */
+ #define ret  			repz ret
+ 
+ .bss
+-.globl	___cpu_features;	.align 4
+-___cpu_features:		.space 4
++.globl	__cpu_features; 	.align 4
++__cpu_features: 		.space 4
+ 
+ .text
+-.globl	___cpu_features_init;	.p2align	4,,15
+-.def	___cpu_features_init;	.scl	2;	.type	32;	.endef
++.globl	__cpu_features_init;	.p2align	4,,15
++.def	__cpu_features_init;	.scl	2;	.type	32;	.endef
+ 
+-___cpu_features_init:
++__cpu_features_init:
  
  .cfi_startproc
 -/* Initialization requires use of the CPUID instruction; to check if it is
@@ -65,7 +107,11 @@
   * supported by the host CPU, we try to toggle the CPUID flag bit within the
   * EFLAGS register, (ultimately leaving it unchanged).
   */
-@@ -97,14 +126,16 @@
+ 		pushf				/* save original flags state */
+ 		pushf				/* duplicate them in both... */
+@@ -95,18 +132,20 @@
+  */
+ 		xor	eax, edx		/* isolate CPUID_FLAG state  */
  		test	eax, CPUID_FLAG		/* did it change?	     */
  		je	90f			/* no: quit immediately      */
  
@@ -85,7 +131,24 @@
  
  /* First, we must perform a level zero CPUID enquiry, to determine the
   * maximum level of interrogation which is supported.
-@@ -170,44 +201,44 @@
+  */
+ 		xor	eax, eax		/* zero request level code   */
+@@ -119,11 +158,11 @@
+  */
+ 		mov	eax, 1			/* select level one enquiry  */
+ 		cpuid				/* get level one response    */
+ 
+ /* Evaluate CPU capabilities (available features), accumulating flags for
+- * each in EAX, for eventual update of the global ___cpu_features variable.
++ * each in EAX, for eventual update of the global __cpu_features variable.
+  */
+ 		xor	eax, eax		/* start with a clean slate  */
+ 
+ /* The CPUID level one features, in which we are interested, are reported
+  * in the ECX and EDX registers, using the following single bit flags for
+@@ -168,48 +207,48 @@ 15:
+ /* We must create a local stack frame, with the stack pointer aligned to a
+  * sixteen byte boundary, in which to allocate an FXSAVE buffer; (failure to
   * align this correctly will raise an unhandled exception, and GCC cannot be
   * trusted to get this right in C language code).
   */
@@ -147,7 +210,29 @@
  
  		cmp	ebx, FXTEST_BITS	/* SSE flags were changed?   */
  		jne	20f			/* no: skip SSE detection    */
-@@ -270,10 +301,10 @@
+ 
+ /* If we're still here, then the operating system should support SSE;
+@@ -220,11 +259,11 @@ 15:
+ 		chk	CPUID_CAP(SSE3)
+ 
+ /* Before we move on to extended feature tests, we must store the feature
+  * test flags which we have accumulated so far...
+  */
+-20:		mov	DWORD PTR ___cpu_features, eax
++20:		mov	DWORD PTR __cpu_features, eax
+ 
+ /* ...so that EAX becomes available for us to, first confirm that extended
+  * feature tests are supported...
+  */
+ 		mov	eax, 0x80000000		/* select extended features  */
+@@ -264,18 +303,18 @@ 20:		mov	DWORD PTR ___cpu_features, eax
+ 30:		chk	CPUID_CAP(3DNOWP)
+ 
+ /* Finally, we combine the extended feature test flags with those which we
+  * had previously accumulated from the regular feature tests, before...
+  */
+-		or	DWORD PTR ___cpu_features, eax
++		or	DWORD PTR __cpu_features, eax
  
  /* ...we restore the preserved state of the EBX register...
   */
@@ -161,3 +246,5 @@
  
  /* ...and return to the C runtime initialization procedure.
   */
+ 90:		ret
+ 

diff -r 70e595a04113 -r 68fa70d72cc1 series
--- a/series	Sun Apr 21 18:09:02 2019 +0000
+++ b/series	Wed Apr 24 14:08:07 2019 +0100
@@ -1,10 +1,11 @@
+cpu-features-x86-64.patch #+win64
 win64-context.patch #+win64
 winnt-decl-64.patch #+win64
-cpu-features-x86-64.patch #+win64
 win64-time-typedef.patch #+win64
 alloca-testing.patch #+void #-void
 winerror-winsock2-update.patch #+void #-void
 winnls-self-contained.patch #+self-contained
+winnt-page-targets.patch
 winnls-layout-improvement.patch
 winnls-reorganization.patch
 win10-version-identification.patch

diff -r 70e595a04113 -r 68fa70d72cc1 winnt-page-targets.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/winnt-page-targets.patch	Wed Apr 24 14:08:07 2019 +0100
@@ -0,0 +1,31 @@
+# HG changeset patch
+# Parent b475633dd46d77bfdbfeac3264dfbbda57124610
+diff --git a/w32api/include/winnt.h b/w32api/include/winnt.h
+--- a/w32api/include/winnt.h
++++ b/w32api/include/winnt.h
+@@ -4,11 +4,11 @@
+  * Win32-API macros and definitions originating from the WinNT product line.
+  *
+  * $Id$
+  *
+  * Written by Anders Norlander <[e-mail]>
+- * Copyright (C) 1998-2011, 2016, 2017, MinGW.org Project
++ * Copyright (C) 1998-2011, 2016, 2017, 2019, MinGW.org Project
+  *
+  *
+  * Permission is hereby granted, free of charge, to any person obtaining a
+  * copy of this software and associated documentation files (the "Software"),
+  * to deal in the Software without restriction, including without limitation
+@@ -1046,10 +1046,12 @@ typedef DWORD FLONG;
+ #define PAGE_WRITECOPY				    0x0008
+ #define PAGE_EXECUTE				    0x0010
+ #define PAGE_EXECUTE_READ			    0x0020
+ #define PAGE_EXECUTE_READWRITE			    0x0040
+ #define PAGE_EXECUTE_WRITECOPY			    0x0080
++#define PAGE_TARGETS_INVALID			0x40000000
++#define PAGE_TARGETS_NO_UPDATE			0x40000000
+ #define PAGE_GUARD				    0x0100
+ #define PAGE_NOCACHE				    0x0200
+ #define PAGE_WRITECOMBINE			    0x0400
+ #define MEM_COMMIT				    0x1000
+ #define MEM_RESERVE				    0x2000