commit 7da921a3766c9d2e983dd9756cabb65dd7437cdd
author Rahul Chaudhry <rahulchaudhry@google.com> Fri Sep 15 06:07:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 15 06:07:24 2017 +0000
tree 386fb81d595b14ef527106a758d2fd713b1edade
parent f3e0802a9a8de5a7318fa2bbff1070bee8f8ec54
parent cbdfd753e1de9ee5fd043eda4972737c5dd19bd4

Merge "gas: explicit cast between pointer and integer of different size." am: 4017c42d6e
am: cbdfd753e1

Change-Id: I4446f2dabbd397ca9afcc0425534a7c8601e4973

binutils-2.27/gas/dwarf2dbg.c

diff --git a/binutils-2.27/gas/dwarf2dbg.c b/binutils-2.27/gas/dwarf2dbg.c
index 16e136e..72c954a 100644
--- a/binutils-2.27/gas/dwarf2dbg.c
+++ b/binutils-2.27/gas/dwarf2dbg.c
@@ -44,6 +44,7 @@
 
 #include "dwarf2dbg.h"
 #include <filenames.h>
+#include <stdint.h>
 
 #include "hash.h"
 
@@ -1878,7 +1879,7 @@
       strtab->hashtab = hash_new ();
     }
 
-  val = (offsetT) hash_find (strtab->hashtab, str);
+  val = (offsetT) (uintptr_t)hash_find (strtab->hashtab, str);
   if (val != 0)
     return val;
 
@@ -1896,7 +1897,7 @@
 
   key = xstrdup (str);
   val = strtab->next_offset;
-  hash_insert (strtab->hashtab, key, (void *) val);
+  hash_insert (strtab->hashtab, key, (void *) (uintptr_t)val);
   strtab->strings[strtab->strings_in_use++] = key;
   strtab->next_offset += strlen(key) + 1;
   return val;