From 1d3e81a9e7795a320406cd903ef1767072ae122e Mon Sep 17 00:00:00 2001
From: Dmitriy Ivanov <dimitry@google.com>
Date: Mon, 6 Oct 2014 11:30:43 -0700
Subject: [PATCH] Resolve "unused DT entry" warnings for x86_64

Bug: 18186310

(cherry picked from commit 513e29e16f16a6ffa1636ba282d599fd6b437aeb)

Change-Id: I1e4c5af2cdc09dc978c7a78fcdcf8796c919751e
---
 linker/linker.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 7b27cd79e..d2bf4e570 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1936,14 +1936,19 @@ bool soinfo::PrelinkImage() {
           return false;
         }
         break;
-#if !defined(__LP64__)
       case DT_PLTREL:
-        if (d->d_un.d_val != DT_REL) {
-          DL_ERR("unsupported DT_RELA in \"%s\"", name);
+#if defined(USE_RELA)
+        if (d->d_un.d_val != DT_RELA) {
+          DL_ERR("unsupported DT_PLTREL in \"%s\"; expected DT_RELA", name);
+          return false;
+        }
+#else
+        if (d->d_un.d_val != DT_REL) {
+          DL_ERR("unsupported DT_PLTREL in \"%s\"; expected DT_REL", name);
           return false;
         }
-        break;
 #endif
+        break;
       case DT_JMPREL:
 #if defined(USE_RELA)
         plt_rela = reinterpret_cast<ElfW(Rela)*>(load_bias + d->d_un.d_ptr);
@@ -2120,6 +2125,11 @@ bool soinfo::PrelinkImage() {
         mips_gotsym = d->d_un.d_val;
         break;
 #endif
+      case DT_VERSYM:
+      case DT_VERDEF:
+      case DT_VERDEFNUM:
+        // Ignore: bionic does not support symbol versioning...
+        break;
 
       default:
         if (!relocating_linker) {