commit b81a871cbb2d99168bdb8380b6142139135f418f
author Dmitriy Ivanov <dimitry@google.com> Sat Feb 14 00:38:03 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 14 00:38:04 2015 +0000
tree 4cc0220ec0ff22f3039a5ee9ef5a2e550a16330f
parent 150403caa8135bef5d5df37e288276ac4f95a234
parent c6292ea39cce054175e4f9f797c05aeb8da0ac4b

Merge changes I88827aa0,Ib0b0987a

* changes:
  Fix: DT_DEBUG was acting as DT_REL on mips64
  Add missing SHT_LOOS/SHT_HIOS values

libc/include/elf.h

diff --git a/libc/include/elf.h b/libc/include/elf.h
index 2039cc0..a41a244 100644
--- a/libc/include/elf.h
+++ b/libc/include/elf.h
@@ -106,6 +106,9 @@
 #define STB_LOPROC    13
 #define STB_HIPROC    15
 
+#define SHT_LOOS    0x60000000
+#define SHT_HIOS    0x6fffffff
+
 #define STT_GNU_IFUNC 10
 #define STT_LOOS      10
 #define STT_HIOS      12

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 3934484..5d2425f 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -2040,8 +2040,8 @@
         if ((dynamic_flags & PF_W) != 0) {
           d->d_un.d_val = reinterpret_cast<uintptr_t>(&_r_debug);
         }
-        break;
 #endif
+        break;
 #if defined(USE_RELA)
       case DT_RELA:
         rela_ = reinterpret_cast<ElfW(Rela)*>(load_bias + d->d_un.d_ptr);