Index: llvm/trunk/test/tools/llvm-readobj/gnu-section-mapping-no-phdrs.test
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/gnu-section-mapping-no-phdrs.test
+++ llvm/trunk/test/tools/llvm-readobj/gnu-section-mapping-no-phdrs.test
@@ -0,0 +1,5 @@
+RUN: llvm-readelf --section-mapping %p/Inputs/trivial.obj.elf-x86-64 | FileCheck %s
+CHECK:      Section to Segment mapping:
+CHECK-NEXT:   Segment Sections...
+CHECK-NEXT:    None   .text .rela.text .data .bss .rodata.str1.1 .note.GNU-stack .shstrtab .symtab .strtab {{$}}
+CHECK-NOT: {{.}}
Index: llvm/trunk/test/tools/llvm-readobj/gnu-section-mapping-no-shdrs.test
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/gnu-section-mapping-no-shdrs.test
+++ llvm/trunk/test/tools/llvm-readobj/gnu-section-mapping-no-shdrs.test
@@ -0,0 +1,15 @@
+RUN: llvm-objcopy --strip-sections %p/Inputs/phdrs-elf.exe-x86_64 %t.o
+RUN: llvm-readelf --section-mapping %t.o | FileCheck %s
+CHECK:      Section to Segment mapping:
+CHECK-NEXT:   Segment Sections...
+CHECK-NEXT:    00 {{$}}
+CHECK-NEXT:    01 {{$}}
+CHECK-NEXT:    02 {{$}}
+CHECK-NEXT:    03 {{$}}
+CHECK-NEXT:    04 {{$}}
+CHECK-NEXT:    05 {{$}}
+CHECK-NEXT:    06 {{$}}
+CHECK-NEXT:    07 {{$}}
+CHECK-NEXT:    08 {{$}}
+CHECK-NEXT:    09 {{$}}
+CHECK-NOT: {{.}}