commit 006e0770ffaa57d88f407fad8d9b78ea0efa9c6a
author Dmitriy Ivanov <dimitry@google.com> Tue Jul 08 18:27:20 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 07 17:50:18 2014 +0000
tree 337867e4fdbe7af8537462870d673664789165d9
parent 7244a8610a1b6f7cb38336696e15e2e4ee04613c
parent 3a8646fc5d9f1a9304251a1d1c8ff9e523d81b40

Merge "Change android_dlextinfo flags to uint64_t"

libc/include/android/dlext.h

diff --git a/libc/include/android/dlext.h b/libc/include/android/dlext.h
index 616e08e..5c3a206 100644
--- a/libc/include/android/dlext.h
+++ b/libc/include/android/dlext.h
@@ -63,7 +63,7 @@
 };
 
 typedef struct {
-  int     flags;
+  uint64_t flags;
   void*   reserved_addr;
   size_t  reserved_size;
   int     relro_fd;

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 506c3f2..04ffe59 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -856,7 +856,7 @@
     return NULL;
   }
   if (extinfo != NULL && ((extinfo->flags & ~(ANDROID_DLEXT_VALID_FLAG_BITS)) != 0)) {
-    DL_ERR("invalid extended flags to android_dlopen_ext: %x", extinfo->flags);
+    DL_ERR("invalid extended flags to android_dlopen_ext: %" PRIx64, extinfo->flags);
     return NULL;
   }
   protect_data(PROT_READ | PROT_WRITE);