diff options
| -rw-r--r-- | debuggerd/mips/machine.cpp | 16 | ||||
| -rw-r--r-- | fastbootd/transport.c | 2 | ||||
| -rw-r--r-- | include/backtrace/BacktraceMap.h | 1 | ||||
| -rw-r--r-- | init/property_service.c | 1 | ||||
| -rw-r--r-- | libbacktrace/UnwindMap.cpp | 1 | ||||
| -rw-r--r-- | libpixelflinger/codeflinger/CodeCache.cpp | 2 | ||||
| -rw-r--r-- | libsync/Android.mk | 2 | ||||
| -rw-r--r-- | libutils/Printer.cpp | 6 | ||||
| -rw-r--r-- | toolbox/watchprops.c | 2 |
9 files changed, 21 insertions, 12 deletions
diff --git a/debuggerd/mips/machine.cpp b/debuggerd/mips/machine.cpp index ab34182..5c82d4d 100644 --- a/debuggerd/mips/machine.cpp +++ b/debuggerd/mips/machine.cpp @@ -32,10 +32,22 @@ #define R(x) (static_cast<unsigned int>(x)) +// The MIPS uapi ptrace.h has the wrong definition for pt_regs. PTRACE_GETREGS +// writes 64-bit quantities even though the public struct uses 32-bit ones. +struct pt_regs_mips_t { + uint64_t regs[32]; + uint64_t lo; + uint64_t hi; + uint64_t cp0_epc; + uint64_t cp0_badvaddr; + uint64_t cp0_status; + uint64_t cp0_cause; +}; + // If configured to do so, dump memory around *all* registers // for the crashing thread. void dump_memory_and_code(log_t* log, pid_t tid, int scope_flags) { - pt_regs r; + pt_regs_mips_t r; if (ptrace(PTRACE_GETREGS, tid, 0, &r)) { return; } @@ -78,7 +90,7 @@ void dump_memory_and_code(log_t* log, pid_t tid, int scope_flags) { } void dump_registers(log_t* log, pid_t tid, int scope_flags) { - pt_regs r; + pt_regs_mips_t r; if(ptrace(PTRACE_GETREGS, tid, 0, &r)) { _LOG(log, scope_flags, "cannot get registers: %s\n", strerror(errno)); return; diff --git a/fastbootd/transport.c b/fastbootd/transport.c index ce8f9d0..9a16fd7 100644 --- a/fastbootd/transport.c +++ b/fastbootd/transport.c @@ -55,7 +55,7 @@ int transport_handle_download(struct transport_handle *thandle, size_t len) ftruncate(fd, len); buffer = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); - if (buffer == NULL) { + if (buffer == MAP_FAILED) { D(ERR, "mmap(%zu) failed: %d %s", len, errno, strerror(errno)); goto err; } diff --git a/include/backtrace/BacktraceMap.h b/include/backtrace/BacktraceMap.h index 13083bd..c717f09 100644 --- a/include/backtrace/BacktraceMap.h +++ b/include/backtrace/BacktraceMap.h @@ -18,6 +18,7 @@ #define _BACKTRACE_BACKTRACE_MAP_H #include <stdint.h> +#include <sys/types.h> #ifdef USE_MINGW // MINGW does not define these constants. #define PROT_NONE 0 diff --git a/init/property_service.c b/init/property_service.c index 4bcf883..fb3bc8d 100644 --- a/init/property_service.c +++ b/init/property_service.c @@ -38,7 +38,6 @@ #include <sys/types.h> #include <netinet/in.h> #include <sys/mman.h> -#include <sys/atomics.h> #include <private/android_filesystem_config.h> #include <selinux/selinux.h> diff --git a/libbacktrace/UnwindMap.cpp b/libbacktrace/UnwindMap.cpp index 1615518..4f9831b 100644 --- a/libbacktrace/UnwindMap.cpp +++ b/libbacktrace/UnwindMap.cpp @@ -15,6 +15,7 @@ */ #include <pthread.h> +#include <stdlib.h> #include <sys/types.h> #include <unistd.h> diff --git a/libpixelflinger/codeflinger/CodeCache.cpp b/libpixelflinger/codeflinger/CodeCache.cpp index 7446da2..8afe0a9 100644 --- a/libpixelflinger/codeflinger/CodeCache.cpp +++ b/libpixelflinger/codeflinger/CodeCache.cpp @@ -89,7 +89,7 @@ static mspace getMspace() gExecutableStore = mmap(NULL, kMaxCodeCacheCapacity, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE, fd, 0); - LOG_ALWAYS_FATAL_IF(gExecutableStore == NULL, + LOG_ALWAYS_FATAL_IF(gExecutableStore == MAP_FAILED, "Creating code cache, mmap failed with error " "'%s'", strerror(errno)); close(fd); diff --git a/libsync/Android.mk b/libsync/Android.mk index 626b762..fd1c88c 100644 --- a/libsync/Android.mk +++ b/libsync/Android.mk @@ -7,6 +7,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := liblog LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include +LOCAL_CFLAGS := -Werror include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -15,4 +16,5 @@ LOCAL_MODULE := sync_test LOCAL_MODULE_TAGS := optional tests LOCAL_SHARED_LIBRARIES := liblog LOCAL_C_INCLUDES := $(LOCAL_PATH)/include +LOCAL_CFLAGS := -Werror include $(BUILD_EXECUTABLE) diff --git a/libutils/Printer.cpp b/libutils/Printer.cpp index 263e740..1dc8632 100644 --- a/libutils/Printer.cpp +++ b/libutils/Printer.cpp @@ -25,10 +25,6 @@ #include <stdio.h> #include <stdlib.h> -#ifndef __BIONIC__ -#define fdprintf dprintf -#endif - namespace android { /* @@ -120,7 +116,7 @@ void FdPrinter::printLine(const char* string) { } #ifndef USE_MINGW - fdprintf(mFd, mFormatString, mPrefix, string); + dprintf(mFd, mFormatString, mPrefix, string); #endif } diff --git a/toolbox/watchprops.c b/toolbox/watchprops.c index 06cdebe..0d05aba 100644 --- a/toolbox/watchprops.c +++ b/toolbox/watchprops.c @@ -6,8 +6,6 @@ #include <cutils/properties.h> #include <cutils/hashmap.h> -#include <sys/atomics.h> - #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ #include <sys/_system_properties.h> |