[llvm-commits] [llvm] r132735 - in /llvm/trunk: lib/CodeGen/TargetLoweringObjectFileImpl.cpp test/CodeGen/X86/eh_frame.ll

[Rafael Espindola]

Author: rafael
Date: Tue Jun  7 18:26:45 2011
New Revision: 132735

URL: http://llvm.org/viewvc/llvm-project?rev=132735&view=rev
Log:
Fix a silly error I introduce in r131951.
Fixes PR10095.

Modified:
    llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
    llvm/trunk/test/CodeGen/X86/eh_frame.ll

Modified: llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp?rev=132735&r1=132734&r2=132735&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp (original)
+++ llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp Tue Jun  7 18:26:45 2011
@@ -255,9 +255,6 @@
       Name.startswith(".llvm.linkonce.tb."))
     return SectionKind::getThreadBSS();
 
-  if (Name == ".eh_frame")
-    return SectionKind::getReadOnlyWithRel();
-
   return K;
 }
 
@@ -290,7 +287,7 @@
   if (K.isText())
     Flags |= ELF::SHF_EXECINSTR;
 
-  if (K.isWriteable() && !K.isReadOnlyWithRel())
+  if (K.isWriteable())
     Flags |= ELF::SHF_WRITE;
 
   if (K.isThreadLocal())

Modified: llvm/trunk/test/CodeGen/X86/eh_frame.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/eh_frame.ll?rev=132735&r1=132734&r2=132735&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/eh_frame.ll (original)
+++ llvm/trunk/test/CodeGen/X86/eh_frame.ll Tue Jun  7 18:26:45 2011
@@ -1,5 +1,14 @@
-; RUN: llc < %s -mtriple x86_64-unknown-linux-gnu | FileCheck %s
+; RUN: llc < %s -mtriple x86_64-unknown-linux-gnu | FileCheck -check-prefix=STATIC %s
+; RUN: llc < %s -mtriple x86_64-unknown-linux-gnu -relocation-model=pic | FileCheck -check-prefix=PIC %s
 
 @__FRAME_END__ = constant [1 x i32] zeroinitializer, section ".eh_frame"
 
-; CHECK: .section	.eh_frame,"a", at progbits
+ at foo = external global i32
+ at bar1 = constant i8* bitcast (i32* @foo to i8*), section "my_bar1", align 8
+
+
+; STATIC: .section	.eh_frame,"a", at progbits
+; STATIC: .section	my_bar1,"a", at progbits
+
+; PIC:	.section	.eh_frame,"a", at progbits
+; PIC:	.section	my_bar1,"aw", at progbits