Reverting due to Green Dragon bot failure.

http://green.lab.llvm.org/green/job/clang-stage1-cmake-RA-incremental/42594/

llvm-svn: 313706

6 files changed, 3 insertions, 64 deletions

diff --git a/llvm/test/MC/WebAssembly/array-fill.ll b/llvm/test/MC/WebAssembly/array-fill.ll
index 38274c34305..4feabc0748e 100644
--- a/llvm/test/MC/WebAssembly/array-fill.ll
+++ b/llvm/test/MC/WebAssembly/array-fill.ll
@@ -9,14 +9,6 @@ target triple = "wasm32-unknown-unknown-wasm"
 
 @gBd = hidden global [2 x %struct.bd] [%struct.bd { i8 1 }, %struct.bd { i8 2 }], align 1
 
-; CHECK:        - Type:            DATA
-; CHECK:              Content:         '0102'
-
-; CHECK:        - Type:            CUSTOM
-; CHECK-NEXT:     Name:            linking
-; CHECK-NEXT:     DataSize:        2
-; CHECK-NEXT:     DataAlignment:   1
-; CHECK-NEXT:     SegmentNames:    
-; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            .data
-; CHECK-NEXT: ...
+; CHECK:  - Type:            DATA
+; CHECK:        Content:         '0102'
+; CHECK:    DataSize:        2
diff --git a/llvm/test/MC/WebAssembly/bss.ll b/llvm/test/MC/WebAssembly/bss.ll
deleted file mode 100644
index d203efad19b..00000000000
--- a/llvm/test/MC/WebAssembly/bss.ll
+++ /dev/null
@@ -1,20 +0,0 @@
-; RUN: llc -mtriple wasm32-unknown-unknown-wasm -filetype=obj %s -o - | obj2yaml | FileCheck %s
-
-@g0 = global i8* null, align 4
-
-; CHECK:        - Type:            DATA
-; CHECK-NEXT:     Segments:        
-; CHECK-NEXT:       - SectionOffset:   6
-; CHECK-NEXT:         MemoryIndex:     0
-; CHECK-NEXT:         Offset:          
-; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           0
-; CHECK-NEXT:         Content:         '00000000'
-; CHECK-NEXT:   - Type:            CUSTOM
-; CHECK-NEXT:     Name:            linking
-; CHECK-NEXT:     DataSize:        4
-; CHECK-NEXT:     DataAlignment:   4
-; CHECK-NEXT:     SegmentNames:    
-; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            .bss.g0
-; CHECK-NEXT: ...
diff --git a/llvm/test/MC/WebAssembly/explicit-sections.ll b/llvm/test/MC/WebAssembly/explicit-sections.ll
index a8342b62818..e9607242252 100644
--- a/llvm/test/MC/WebAssembly/explicit-sections.ll
+++ b/llvm/test/MC/WebAssembly/explicit-sections.ll
@@ -63,16 +63,3 @@
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           24
 ; CHECK-NEXT:         Content:         '08000000'
-
-; CHECK:        - Type:            CUSTOM
-; CHECK-NEXT:     Name:            linking
-; CHECK-NEXT:     DataSize:        28
-; CHECK-NEXT:     DataAlignment:   8
-; CHECK-NEXT:     SegmentNames:    
-; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            .data.global0
-; CHECK-NEXT:       - Index:           1
-; CHECK-NEXT:         Name:            .sec1
-; CHECK-NEXT:       - Index:           2
-; CHECK-NEXT:         Name:            .sec2
-; CHECK-NEXT: ...
diff --git a/llvm/test/MC/WebAssembly/unnamed-data.ll b/llvm/test/MC/WebAssembly/unnamed-data.ll
index a484913e289..b5f6d3c524c 100644
--- a/llvm/test/MC/WebAssembly/unnamed-data.ll
+++ b/llvm/test/MC/WebAssembly/unnamed-data.ll
@@ -74,13 +74,4 @@
 ; CHECK-NEXT:     Name:            linking
 ; CHECK-NEXT:     DataSize:        28
 ; CHECK-NEXT:     DataAlignment:   8
-; CHECK-NEXT:     SegmentNames:    
-; CHECK-NEXT:       - Index:       0
-; CHECK-NEXT:         Name:        .rodata..L.str1
-; CHECK-NEXT:       - Index:       1
-; CHECK-NEXT:         Name:        .rodata..L.str2
-; CHECK-NEXT:       - Index:       2
-; CHECK-NEXT:         Name:        .data.a
-; CHECK-NEXT:       - Index:       3
-; CHECK-NEXT:         Name:        .data.b
 ; CHECK-NEXT: ...
diff --git a/llvm/test/MC/WebAssembly/weak-alias.ll b/llvm/test/MC/WebAssembly/weak-alias.ll
index 2beef846def..79c597bc09a 100644
--- a/llvm/test/MC/WebAssembly/weak-alias.ll
+++ b/llvm/test/MC/WebAssembly/weak-alias.ll
@@ -101,9 +101,4 @@ entry:
 ; CHECK-NEXT:         Flags:           1
 ; CHECK-NEXT:       - Name:            bar_alias
 ; CHECK-NEXT:         Flags:           1
-; CHECK-NEXT:     SegmentNames:    
-; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            .data.bar
-; CHECK-NEXT:       - Index:           1
-; CHECK-NEXT:         Name:            .data.bar_alias_address
 ; CHECK-NEXT: ...
diff --git a/llvm/test/tools/llvm-readobj/sections.test b/llvm/test/tools/llvm-readobj/sections.test
index ac1eca535fc..4eda5dae882 100644
--- a/llvm/test/tools/llvm-readobj/sections.test
+++ b/llvm/test/tools/llvm-readobj/sections.test
@@ -543,12 +543,6 @@ WASM-NEXT:   Section {
 WASM-NEXT:     Type: DATA (0xB)
 WASM-NEXT:     Size: 19
 WASM-NEXT:     Offset: 154
-WASM-NEXT:     Segments [
-WASM-NEXT:       Segment {
-WASM-NEXT:         Size: 13
-WASM-NEXT:         Offset: 0
-WASM-NEXT:       }
-WASM-NEXT:     ]
 WASM-NEXT:   }
 WASM-NEXT:   Section {
 WASM-NEXT:     Type: CUSTOM (0x0)