system/core 64-bit cleanup.
This cleans up most of the size-related problems in system/core.
There are still a few changes needed for a clean 64-bit build,
but they look like they might require changes to things like the
fastboot protocol.
Change-Id: I1560425a289fa158e13e2e3173cc3e71976f92c0
diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index d44c679..4c6139c 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -298,7 +298,7 @@
}
else if (entry->entry.len != ret - sizeof(struct logger_entry)) {
fprintf(stderr, "read: unexpected length. Expected %d, got %d\n",
- entry->entry.len, ret - sizeof(struct logger_entry));
+ entry->entry.len, ret - (int) sizeof(struct logger_entry));
exit(EXIT_FAILURE);
}
diff --git a/logwrapper/logwrapper.c b/logwrapper/logwrapper.c
index db6cb4c..9e0385d 100644
--- a/logwrapper/logwrapper.c
+++ b/logwrapper/logwrapper.c
@@ -90,7 +90,8 @@
}
if (seg_fault_on_exit) {
- *(int *)status = 0; // causes SIGSEGV with fault_address = status
+ uintptr_t fault_address = (uintptr_t) status;
+ *(int *) fault_address = 0; // causes SIGSEGV with fault_address = status
}
return rc;
