Update for upstream additions.

Author: Sterling-Augustine

llvm/lib/MC/MCObjectFileInfo.cpp

@@ -553,7 +553,7 @@ void MCObjectFileInfo::initELFMCObjectFileInfo(const Triple &T, bool Large) {
       Ctx->getELFSection(".eh_frame", EHSectionType, EHSectionFlags);
 
   SFrameSection =
-      Ctx->getELFSection(".sframe", ELF::SHT_SFRAME, ELF::SHF_ALLOC);
+      Ctx->getELFSection(".sframe", ELF::SHT_GNU_SFRAME, ELF::SHF_ALLOC);
 
   StackSizesSection = Ctx->getELFSection(".stack_sizes", ELF::SHT_PROGBITS, 0);
 

llvm/test/MC/ELF/cfi-sframe.s

@@ -1,7 +1,7 @@
 // TODO: Add other architectures as they gain sframe support
 // REQUIRES: x86-registered-target
 // RUN: llvm-mc --assemble --filetype=obj --gsframe -triple x86_64 %s -o %t.o
-// RUN: objdump --sframe %t.o | FileCheck %s
+// RUN: llvm-readelf --sframe %t.o | FileCheck %s
 
 .cfi_sections .sframe
 
@@ -10,11 +10,17 @@ f1:
         nop
         .cfi_endproc
 
-
-// CHECK:	Contents of the SFrame section .sframe:
-// CHECK-NEXT:	  Header :
-// CHECK:	    Version: SFRAME_VERSION_2
-// CHECK-NEXT:	    Flags: NONE
-// CHECK-NEXT:	    Num FDEs: 0
-// CHECK-NEXT:	    Num FREs: 0
-// CHECK:        Function Index :
+// CHECK: SFrame section '.sframe' {
+// CHECK-NEXT:  Header {
+// CHECK-NEXT:    Magic: 0xDEE2
+// CHECK-NEXT:    Version: V2 (0x2)
+// CHECK-NEXT:    Flags [ (0x0)
+// CHECK:    ABI: AMD64EndianLittle (0x3)
+// CHECK-NEXT:    CFA fixed FP offset (unused): 0
+// CHECK-NEXT:    CFA fixed RA offset: 0
+// CHECK-NEXT:    Auxiliary header length: 0
+// CHECK-NEXT:    Num FDEs: 0
+// CHECK-NEXT:    Num FREs: 0
+// CHECK-NEXT:    FRE subsection length: 0
+// CHECK-NEXT:    FDE subsection offset: 0
+// CHECK-NEXT:    FRE subsection offset: 0