generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am b9c5d606: am 006e0770: Merge "Change android_dlextinfo flags to uint64_t"

Browse Source 
* commit 'b9c5d606aab6c1a21e3785d155613c35c276eb18':
  Change android_dlextinfo flags to uint64_t
This commit is contained in:
Dmitriy Ivanov 2014-07-08 18:35:19 +00:00 committed by Android Git Automerger
commit 4c63233511
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/include/android/dlext.h
View File

@ -63,7 +63,7 @@ enum {
}; };
typedef struct { typedef struct {
int flags; uint64_t flags;
void* reserved_addr; void* reserved_addr;
size_t reserved_size; size_t reserved_size;
int relro_fd; int relro_fd;

2
linker/linker.cpp
View File

@ -856,7 +856,7 @@ soinfo* do_dlopen(const char* name, int flags, const android_dlextinfo* extinfo)
return NULL; return NULL;
} }
if (extinfo != NULL && ((extinfo->flags & ~(ANDROID_DLEXT_VALID_FLAG_BITS)) != 0)) { 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; return NULL;
} }
protect_data(PROT_READ | PROT_WRITE); protect_data(PROT_READ | PROT_WRITE);