Revert "libelffile: move to DWARF3 when writing .debug_frame."

This reverts commit 546243375d7e129aa02ca7ea9663ed7c40b4880e.

Reason for revert: DWARF-64 is supposed to be used for libraries
over 4GB in size.  It is unrelated to pointer sizes and linked bug.
(the spec explicitly says that it should not be used in our case)

Bug: 192012848
Change-Id: Iaf4679b6d4cb27d049277ef7bdc6606771390a6b

1 files changed, 3 insertions, 3 deletions

diff --git a/compiler/debug/dwarf/dwarf_test.cc b/compiler/debug/dwarf/dwarf_test.cc
index 8fdc7ca63a..8897e45584 100644
--- a/compiler/debug/dwarf/dwarf_test.cc
+++ b/compiler/debug/dwarf/dwarf_test.cc
@@ -131,7 +131,7 @@ TEST_F(DwarfTest, DebugFrame) {
   CheckObjdumpOutput(is64bit, "-debug-frame");
 }
 
-TEST_F(DwarfTest, DebugFrame64) {
+TEST_F(DwarfTest, DISABLED_DebugFrame64) {
   constexpr bool is64bit = true;
   DebugFrameOpCodeWriter<> initial_opcodes;
   WriteCIE(is64bit, Reg(16), initial_opcodes, &debug_frame_data_);
@@ -143,7 +143,7 @@ TEST_F(DwarfTest, DebugFrame64) {
            0x0200000000000000,
            ArrayRef<const uint8_t>(*opcodes.data()),
            &debug_frame_data_);
-  DW_CHECK("FDE cie=00000000 pc=100000000000000...300000000000000");
+  DW_CHECK("FDE cie=00000000 pc=100000000000000..300000000000000");
 
   CheckObjdumpOutput(is64bit, "-debug-frame");
 }
@@ -158,7 +158,7 @@ TEST_F(DwarfTest, x86_64_RegisterMapping) {
     opcodes.RelOffset(Reg::X86_64Core(i), 0);
   }
   DW_CHECK("FDE");
-  DW_CHECK_NEXT("DWARF64");
+  DW_CHECK_NEXT("DWARF32");
   DW_CHECK_NEXT("DW_CFA_nop:");  // TODO: Why is a nop here.
   DW_CHECK_NEXT("DW_CFA_offset: RAX 0");
   DW_CHECK_NEXT("DW_CFA_offset: RCX 0");