[llvm-branch-commits] [llvm-branch] r164529 - in /llvm/branches/R600: lib/MC/MCObjectFileInfo.cpp test/MC/COFF/global_ctors.ll test/MC/COFF/global_ctors_dtors.ll

[Tom Stellard]

Author: tstellar
Date: Mon Sep 24 10:52:34 2012
New Revision: 164529

URL: http://llvm.org/viewvc/llvm-project?rev=164529&view=rev
Log:
Emit dtors into proper section while compiling in vcpp-compatible mode.
Patch by Kai!

Added:
    llvm/branches/R600/test/MC/COFF/global_ctors_dtors.ll
      - copied, changed from r164528, llvm/branches/R600/test/MC/COFF/global_ctors.ll
Removed:
    llvm/branches/R600/test/MC/COFF/global_ctors.ll
Modified:
    llvm/branches/R600/lib/MC/MCObjectFileInfo.cpp

Modified: llvm/branches/R600/lib/MC/MCObjectFileInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/R600/lib/MC/MCObjectFileInfo.cpp?rev=164529&r1=164528&r2=164529&view=diff
==============================================================================
--- llvm/branches/R600/lib/MC/MCObjectFileInfo.cpp (original)
+++ llvm/branches/R600/lib/MC/MCObjectFileInfo.cpp Mon Sep 24 10:52:34 2012
@@ -430,12 +430,20 @@
   }
 
 
-  StaticDtorSection =
-    Ctx->getCOFFSection(".dtors",
-                        COFF::IMAGE_SCN_CNT_INITIALIZED_DATA |
-                        COFF::IMAGE_SCN_MEM_READ |
-                        COFF::IMAGE_SCN_MEM_WRITE,
-                        SectionKind::getDataRel());
+  if (T.getOS() == Triple::Win32) {
+    StaticDtorSection =
+      Ctx->getCOFFSection(".CRT$XTX",
+                          COFF::IMAGE_SCN_CNT_INITIALIZED_DATA |
+                          COFF::IMAGE_SCN_MEM_READ,
+                          SectionKind::getReadOnly());
+  } else {
+    StaticDtorSection =
+      Ctx->getCOFFSection(".dtors",
+                          COFF::IMAGE_SCN_CNT_INITIALIZED_DATA |
+                          COFF::IMAGE_SCN_MEM_READ |
+                          COFF::IMAGE_SCN_MEM_WRITE,
+                          SectionKind::getDataRel());
+  }
 
   // FIXME: We're emitting LSDA info into a readonly section on COFF, even
   // though it contains relocatable pointers.  In PIC mode, this is probably a

Removed: llvm/branches/R600/test/MC/COFF/global_ctors.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/R600/test/MC/COFF/global_ctors.ll?rev=164528&view=auto
==============================================================================
--- llvm/branches/R600/test/MC/COFF/global_ctors.ll (original)
+++ llvm/branches/R600/test/MC/COFF/global_ctors.ll (removed)
@@ -1,28 +0,0 @@
-; Test that global ctors are emitted into the proper COFF section for the
-; target. Mingw uses .ctors, whereas MSVC uses .CRT$XC*.
-; RUN: llc < %s -mtriple i686-pc-win32 | FileCheck %s --check-prefix WIN32 
-; RUN: llc < %s -mtriple x86_64-pc-win32 | FileCheck %s --check-prefix WIN32 
-; RUN: llc < %s -mtriple i686-pc-mingw32 | FileCheck %s --check-prefix MINGW32 
-; RUN: llc < %s -mtriple x86_64-pc-mingw32 | FileCheck %s --check-prefix MINGW32 
-
- at .str = private unnamed_addr constant [13 x i8] c"constructing\00", align 1
- at .str2 = private unnamed_addr constant [5 x i8] c"main\00", align 1
-
- at llvm.global_ctors = appending global [1 x { i32, void ()* }] [{ i32, void ()* } { i32 65535, void ()* @a_global_ctor }]
-
-declare i32 @puts(i8*)
-
-define void @a_global_ctor() nounwind {
-  %1 = call i32 @puts(i8* getelementptr inbounds ([13 x i8]* @.str, i32 0, i32 0))
-  ret void
-}
-
-define i32 @main() nounwind {
-  %1 = call i32 @puts(i8* getelementptr inbounds ([5 x i8]* @.str2, i32 0, i32 0))
-  ret i32 0
-}
-
-; WIN32: .section .CRT$XCU,"r"
-; WIN32: a_global_ctor
-; MINGW32: .section .ctors,"w"
-; MINGW32: a_global_ctor

Copied: llvm/branches/R600/test/MC/COFF/global_ctors_dtors.ll (from r164528, llvm/branches/R600/test/MC/COFF/global_ctors.ll)
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/R600/test/MC/COFF/global_ctors_dtors.ll?p2=llvm/branches/R600/test/MC/COFF/global_ctors_dtors.ll&p1=llvm/branches/R600/test/MC/COFF/global_ctors.ll&r1=164528&r2=164529&rev=164529&view=diff
==============================================================================
--- llvm/branches/R600/test/MC/COFF/global_ctors.ll (original)
+++ llvm/branches/R600/test/MC/COFF/global_ctors_dtors.ll Mon Sep 24 10:52:34 2012
@@ -1,14 +1,16 @@
 ; Test that global ctors are emitted into the proper COFF section for the
 ; target. Mingw uses .ctors, whereas MSVC uses .CRT$XC*.
-; RUN: llc < %s -mtriple i686-pc-win32 | FileCheck %s --check-prefix WIN32 
-; RUN: llc < %s -mtriple x86_64-pc-win32 | FileCheck %s --check-prefix WIN32 
-; RUN: llc < %s -mtriple i686-pc-mingw32 | FileCheck %s --check-prefix MINGW32 
-; RUN: llc < %s -mtriple x86_64-pc-mingw32 | FileCheck %s --check-prefix MINGW32 
+; RUN: llc < %s -mtriple i686-pc-win32 | FileCheck %s --check-prefix WIN32
+; RUN: llc < %s -mtriple x86_64-pc-win32 | FileCheck %s --check-prefix WIN32
+; RUN: llc < %s -mtriple i686-pc-mingw32 | FileCheck %s --check-prefix MINGW32
+; RUN: llc < %s -mtriple x86_64-pc-mingw32 | FileCheck %s --check-prefix MINGW32
 
 @.str = private unnamed_addr constant [13 x i8] c"constructing\00", align 1
- at .str2 = private unnamed_addr constant [5 x i8] c"main\00", align 1
+ at .str2 = private unnamed_addr constant [12 x i8] c"destructing\00", align 1
+ at .str3 = private unnamed_addr constant [5 x i8] c"main\00", align 1
 
 @llvm.global_ctors = appending global [1 x { i32, void ()* }] [{ i32, void ()* } { i32 65535, void ()* @a_global_ctor }]
+ at llvm.global_dtors = appending global [1 x { i32, void ()* }] [{ i32, void ()* } { i32 65535, void ()* @a_global_dtor }]
 
 declare i32 @puts(i8*)
 
@@ -17,12 +19,21 @@
   ret void
 }
 
+define void @a_global_dtor() nounwind {
+  %1 = call i32 @puts(i8* getelementptr inbounds ([12 x i8]* @.str2, i32 0, i32 0))
+  ret void
+}
+
 define i32 @main() nounwind {
-  %1 = call i32 @puts(i8* getelementptr inbounds ([5 x i8]* @.str2, i32 0, i32 0))
+  %1 = call i32 @puts(i8* getelementptr inbounds ([5 x i8]* @.str3, i32 0, i32 0))
   ret i32 0
 }
 
 ; WIN32: .section .CRT$XCU,"r"
 ; WIN32: a_global_ctor
+; WIN32: .section .CRT$XTX,"r"
+; WIN32: a_global_dtor
 ; MINGW32: .section .ctors,"w"
 ; MINGW32: a_global_ctor
+; MINGW32: .section .dtors,"w"
+; MINGW32: a_global_dtor