Merge pull request #1593 from smeenai/safeseh

Mark assembly files as SafeSEH compatible
swiftlang · Jun 13, 2018 · 7b6b7ac · 7b6b7ac
2 parents f20c62a + ff88e27
commit 7b6b7ac
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/CoreFoundation/Base.subproj/CFAsmMacros.h b/CoreFoundation/Base.subproj/CFAsmMacros.h
@@ -20,5 +20,16 @@
 #define NO_EXEC_STACK_DIRECTIVE
 #endif
 
+.macro SAFESEH_REGISTRATION_DIRECTIVE
+#if defined(_WIN32) && defined(_M_IX86)
+    .def @feat.00
+        .scl 3
+        .type 0
+    .endef
+    .globl @feat.00
+@feat.00 = 1
+#endif
+.endm
+
 #endif
 
diff --git a/CoreFoundation/String.subproj/CFCharacterSetData.S b/CoreFoundation/String.subproj/CFCharacterSetData.S
@@ -22,4 +22,4 @@ _C_LABEL(__CFCharacterSetBitmapDataSize):
     .int _C_LABEL(__CFCharacterSetBitmapDataEnd) - _C_LABEL(__CFCharacterSetBitmapData)
 
 NO_EXEC_STACK_DIRECTIVE
-
+SAFESEH_REGISTRATION_DIRECTIVE
diff --git a/CoreFoundation/String.subproj/CFUniCharPropertyDatabase.S b/CoreFoundation/String.subproj/CFUniCharPropertyDatabase.S
@@ -22,4 +22,4 @@ _C_LABEL(__CFUniCharPropertyDatabaseSize):
     .int _C_LABEL(__CFUniCharPropertyDatabaseEnd) - _C_LABEL(__CFUniCharPropertyDatabase)
 
 NO_EXEC_STACK_DIRECTIVE
-
+SAFESEH_REGISTRATION_DIRECTIVE
diff --git a/CoreFoundation/String.subproj/CFUnicodeData.S b/CoreFoundation/String.subproj/CFUnicodeData.S
@@ -36,4 +36,4 @@ _C_LABEL(__CFUnicodeDataLSize):
 #endif
 
 NO_EXEC_STACK_DIRECTIVE
-
+SAFESEH_REGISTRATION_DIRECTIVE
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,4 +22,4 @@ _C_LABEL(__CFCharacterSetBitmapDataSize):
		.int _C_LABEL(__CFCharacterSetBitmapDataEnd) - _C_LABEL(__CFCharacterSetBitmapData)

		NO_EXEC_STACK_DIRECTIVE

		SAFESEH_REGISTRATION_DIRECTIVE
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,4 +22,4 @@ _C_LABEL(__CFUniCharPropertyDatabaseSize):
		.int _C_LABEL(__CFUniCharPropertyDatabaseEnd) - _C_LABEL(__CFUniCharPropertyDatabase)

		NO_EXEC_STACK_DIRECTIVE

		SAFESEH_REGISTRATION_DIRECTIVE
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,4 +36,4 @@ _C_LABEL(__CFUnicodeDataLSize):
		#endif

		NO_EXEC_STACK_DIRECTIVE

		SAFESEH_REGISTRATION_DIRECTIVE