diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-17 00:16:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-17 00:16:05 +0000 |
| commit | 8b9a22f30a6cfc58f35ad5964d90319d5f3c9cd5 (patch) | |
| tree | efdf4c84d73e80749eaaa88b0f1f49d54a663b43 /libc | |
| parent | 2071b98341915dbf63d222539c455f1d60e1a233 (diff) | |
| parent | 4c2da039baa6c621c78afa47ead85ec9e028f56d (diff) | |
| download | android_bionic-8b9a22f30a6cfc58f35ad5964d90319d5f3c9cd5.tar.gz android_bionic-8b9a22f30a6cfc58f35ad5964d90319d5f3c9cd5.tar.bz2 android_bionic-8b9a22f30a6cfc58f35ad5964d90319d5f3c9cd5.zip | |
Merge "Fix the newly-introduced warning and turn on -Werror."
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/Android.mk | 35 | ||||
| -rw-r--r-- | libc/stdio/local.h | 5 |
2 files changed, 27 insertions, 13 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 6297f82d4..f0ee09d3d 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -609,7 +609,9 @@ LOCAL_CFLAGS := \ -I$(LOCAL_PATH)/dns/include \ -I$(LOCAL_PATH)/private \ -I$(LOCAL_PATH)/upstream-netbsd/lib/libc/include \ - -include upstream-netbsd/android/include/netbsd-compat.h + -include upstream-netbsd/android/include/netbsd-compat.h \ +# -Werror \ + LOCAL_CONLYFLAGS := $(libc_common_conlyflags) LOCAL_CPPFLAGS := $(libc_common_cppflags) LOCAL_C_INCLUDES := $(libc_common_c_includes) @@ -636,7 +638,9 @@ LOCAL_CFLAGS := \ -Wno-sign-compare -Wno-uninitialized \ -I$(LOCAL_PATH)/upstream-freebsd/android/include \ -I$(LOCAL_PATH)/upstream-freebsd/lib/libc/include \ - -include freebsd-compat.h + -include freebsd-compat.h \ +# -Werror \ + LOCAL_CONLYFLAGS := $(libc_common_conlyflags) LOCAL_CPPFLAGS := $(libc_common_cppflags) LOCAL_C_INCLUDES := $(libc_common_c_includes) @@ -661,10 +665,12 @@ LOCAL_SRC_FILES := $(libc_upstream_netbsd_src_files) LOCAL_CFLAGS := \ $(libc_common_cflags) \ -Wno-sign-compare -Wno-uninitialized \ + -Werror \ -DPOSIX_MISTAKE \ -I$(LOCAL_PATH)/upstream-netbsd/android/include \ -I$(LOCAL_PATH)/upstream-netbsd/lib/libc/include \ - -include netbsd-compat.h + -include netbsd-compat.h \ + LOCAL_CONLYFLAGS := $(libc_common_conlyflags) LOCAL_CPPFLAGS := $(libc_common_cppflags) LOCAL_C_INCLUDES := $(libc_common_c_includes) @@ -689,10 +695,12 @@ LOCAL_SRC_FILES := $(libc_upstream_openbsd_src_files) LOCAL_CFLAGS := \ $(libc_common_cflags) \ -Wno-sign-compare -Wno-uninitialized \ + -Werror \ -I$(LOCAL_PATH)/upstream-openbsd/android/include \ -I$(LOCAL_PATH)/upstream-openbsd/lib/libc/include \ -I$(LOCAL_PATH)/upstream-openbsd/lib/libc/gdtoa/ \ - -include openbsd-compat.h + -include openbsd-compat.h \ + LOCAL_CONLYFLAGS := $(libc_common_conlyflags) LOCAL_CPPFLAGS := $(libc_common_cppflags) LOCAL_C_INCLUDES := $(libc_common_c_includes) @@ -718,6 +726,7 @@ LOCAL_SRC_FILES_64 := $(libc_upstream_openbsd_gdtoa_src_files_64) LOCAL_CFLAGS := \ $(libc_common_cflags) \ -Wno-sign-compare -Wno-uninitialized \ + -Werror \ -fvisibility=hidden \ -I$(LOCAL_PATH)/upstream-openbsd/android/include \ -I$(LOCAL_PATH)/upstream-openbsd/lib/libc/include \ @@ -832,7 +841,9 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := $(libc_common_c_includes) LOCAL_CFLAGS := $(libc_common_cflags) \ - -DLIBC_STATIC + -DLIBC_STATIC \ + -Werror \ + LOCAL_CONLYFLAGS := $(libc_common_conlyflags) LOCAL_CPPFLAGS := $(libc_common_cppflags) @@ -859,7 +870,9 @@ LOCAL_SRC_FILES := \ bionic/libc_init_static.cpp \ LOCAL_CFLAGS := $(libc_common_cflags) \ - -DLIBC_STATIC + -DLIBC_STATIC \ + -Werror \ + LOCAL_CONLYFLAGS := $(libc_common_conlyflags) LOCAL_CPPFLAGS := $(libc_common_cppflags) LOCAL_C_INCLUDES := $(libc_common_c_includes) @@ -878,7 +891,7 @@ include $(BUILD_STATIC_LIBRARY) # ======================================================== include $(CLEAR_VARS) -LOCAL_CFLAGS := $(libc_common_cflags) +LOCAL_CFLAGS := $(libc_common_cflags) -Werror LOCAL_CONLYFLAGS := $(libc_common_conlyflags) LOCAL_CPPFLAGS := $(libc_common_cppflags) LOCAL_C_INCLUDES := $(libc_common_c_includes) @@ -942,7 +955,9 @@ include $(CLEAR_VARS) LOCAL_CFLAGS := \ $(libc_common_cflags) \ - -DMALLOC_LEAK_CHECK + -DMALLOC_LEAK_CHECK \ + -Werror \ + LOCAL_CONLYFLAGS := $(libc_common_conlyflags) LOCAL_CPPFLAGS := $(libc_common_cppflags) @@ -976,7 +991,9 @@ include $(CLEAR_VARS) LOCAL_CFLAGS := \ $(libc_common_cflags) \ - -DMALLOC_QEMU_INSTRUMENT + -DMALLOC_QEMU_INSTRUMENT \ + -Werror \ + LOCAL_CONLYFLAGS := $(libc_common_conlyflags) LOCAL_CPPFLAGS := $(libc_common_cppflags) diff --git a/libc/stdio/local.h b/libc/stdio/local.h index 907fd2160..7afa761ed 100644 --- a/libc/stdio/local.h +++ b/libc/stdio/local.h @@ -63,10 +63,7 @@ int __svfscanf(FILE * __restrict, const char * __restrict, __va_list); int __vfwprintf(FILE * __restrict, const wchar_t * __restrict, __va_list); int __vfwscanf(FILE * __restrict, const wchar_t * __restrict, __va_list); -/* - * Function to clean up streams, called from abort() and exit(). - */ -extern void (*__cleanup)(void); +extern void __atexit_register_cleanup(void (*)(void)); extern int __sdidinit; /* |