Merge pull request swiftlang#14378 from compnerd/windows-runtime-init…

…ializer
Keno42 · Feb 3, 2018 · 5663b44 · 5663b44
2 parents d2862dd + 76d7bfd
commit 5663b44
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/stdlib/public/runtime/SwiftRT-COFF.cpp b/stdlib/public/runtime/SwiftRT-COFF.cpp
@@ -25,15 +25,16 @@
 #define PRAGMA(pragma) _Pragma(#pragma)
 
 #define DECLARE_SWIFT_SECTION(name)                                            \
-  PRAGMA(section("." #name "$A", long, read, write))                           \
+  PRAGMA(section("." #name "$A", long, read))                                  \
   __declspec(allocate("." #name "$A"))                                         \
   static uintptr_t __start_##name = 0;                                         \
                                                                                \
-  PRAGMA(section("." #name "$C", long, read, write))                           \
+  PRAGMA(section("." #name "$C", long, read))                                  \
   __declspec(allocate("." #name "$C"))                                         \
   static uintptr_t __stop_##name = 0;
 
 extern "C" {
+DECLARE_SWIFT_SECTION(sw5prt)
 DECLARE_SWIFT_SECTION(sw5prtc)
 DECLARE_SWIFT_SECTION(sw5tymd)
 
@@ -59,6 +60,7 @@ static void swift_image_constructor() {
       nullptr,
       nullptr,
 
+      SWIFT_SECTION_RANGE(sw5prt),
       SWIFT_SECTION_RANGE(sw5prtc),
       SWIFT_SECTION_RANGE(sw5tymd),
 
@@ -73,6 +75,8 @@ static void swift_image_constructor() {
   swift_addNewDSOImage(&sections);
 }
 
+#pragma section(".CRT$XCIS", long, read)
+
 __declspec(allocate(".CRT$XCIS"))
 extern "C" void (*pSwiftImageConstructor)(void) = &swift_image_constructor;
 #pragma comment(linker, "/include:" STRING(C_LABEL(pSwiftImageConstructor)))