From e82d33d9976c1e9fbaa4f60cde1bf718d67d6637 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 12 Jun 2014 15:17:31 -0700 Subject: [PATCH] Remove useless stuff from "AndroidConfig.h". The futex wrappers and memcmp16 are no longer available to anyone. No one was checking for the existence of the SA_NOCLDWAIT constant, and even if they wanted to, they could just check directly. Change-Id: If8ac6c2617b76b23a2450f58fc03453f7f82a61f --- .../include/arch/freebsd-x86/AndroidConfig.h | 9 ++------- .../combo/include/arch/linux-arm/AndroidConfig.h | 16 ---------------- .../include/arch/linux-arm64/AndroidConfig.h | 16 ---------------- .../include/arch/linux-mips/AndroidConfig.h | 16 ---------------- .../include/arch/linux-mips64/AndroidConfig.h | 16 ---------------- .../combo/include/arch/linux-ppc/AndroidConfig.h | 5 ----- .../combo/include/arch/linux-x86/AndroidConfig.h | 5 ----- .../arch/target_linux-x86/AndroidConfig.h | 16 ---------------- 8 files changed, 2 insertions(+), 97 deletions(-) diff --git a/core/combo/include/arch/freebsd-x86/AndroidConfig.h b/core/combo/include/arch/freebsd-x86/AndroidConfig.h index 0734661c1..b6c1111e2 100644 --- a/core/combo/include/arch/freebsd-x86/AndroidConfig.h +++ b/core/combo/include/arch/freebsd-x86/AndroidConfig.h @@ -191,7 +191,7 @@ */ /* #define HAVE_GETTID */ -/* +/* * Defined if we have the sched_setscheduler() call */ #define HAVE_SCHED_SETSCHEDULER @@ -256,16 +256,11 @@ */ #define MINCORE_POINTER_TYPE char * -/* - * Do we have the sigaction flag SA_NOCLDWAIT? - */ -#define HAVE_SA_NOCLDWAIT - /* * Define if we include for statfs() */ #define INCLUDE_SYS_MOUNT_FOR_STATFS 1 - + /* * The default path separator for the platform */ diff --git a/core/combo/include/arch/linux-arm/AndroidConfig.h b/core/combo/include/arch/linux-arm/AndroidConfig.h index 9253e7c50..0eb6c7283 100644 --- a/core/combo/include/arch/linux-arm/AndroidConfig.h +++ b/core/combo/include/arch/linux-arm/AndroidConfig.h @@ -54,12 +54,6 @@ */ #define HAVE_FUTEX -/* - * Define if we already have the futex wrapper functions defined. Yes if - * compiling against bionic. - */ -#define HAVE_FUTEX_WRAPPERS 1 - /* * Process creation model. Choose one: * @@ -263,21 +257,11 @@ */ #define OS_SHARED_LIB_FORMAT_STR "lib%s.so" -/* - * Do we have __memcmp16()? - */ -#define HAVE__MEMCMP16 1 - /* * type for the third argument to mincore(). */ #define MINCORE_POINTER_TYPE unsigned char * -/* - * Do we have the sigaction flag SA_NOCLDWAIT? - */ -#define HAVE_SA_NOCLDWAIT - /* * The default path separator for the platform */ diff --git a/core/combo/include/arch/linux-arm64/AndroidConfig.h b/core/combo/include/arch/linux-arm64/AndroidConfig.h index 6f8555530..bcbda8f87 100644 --- a/core/combo/include/arch/linux-arm64/AndroidConfig.h +++ b/core/combo/include/arch/linux-arm64/AndroidConfig.h @@ -54,12 +54,6 @@ */ #define HAVE_FUTEX -/* - * Define if we already have the futex wrapper functions defined. Yes if - * compiling against bionic. - */ -#define HAVE_FUTEX_WRAPPERS 1 - /* * Process creation model. Choose one: * @@ -258,21 +252,11 @@ */ #define OS_SHARED_LIB_FORMAT_STR "lib%s.so" -/* - * Do we have __memcmp16()? - */ -#define HAVE__MEMCMP16 1 - /* * type for the third argument to mincore(). */ #define MINCORE_POINTER_TYPE unsigned char * -/* - * Do we have the sigaction flag SA_NOCLDWAIT? - */ -#define HAVE_SA_NOCLDWAIT - /* * The default path separator for the platform */ diff --git a/core/combo/include/arch/linux-mips/AndroidConfig.h b/core/combo/include/arch/linux-mips/AndroidConfig.h index 2758153fd..076d711d1 100644 --- a/core/combo/include/arch/linux-mips/AndroidConfig.h +++ b/core/combo/include/arch/linux-mips/AndroidConfig.h @@ -54,12 +54,6 @@ */ #define HAVE_FUTEX -/* - * Define if we already have the futex wrapper functions defined. Yes if - * compiling against bionic. - */ -#define HAVE_FUTEX_WRAPPERS 1 - /* * Process creation model. Choose one: * @@ -280,21 +274,11 @@ */ #define OS_SHARED_LIB_FORMAT_STR "lib%s.so" -/* - * Do we have __memcmp16()? - */ -#define HAVE__MEMCMP16 1 - /* * type for the third argument to mincore(). */ #define MINCORE_POINTER_TYPE unsigned char * -/* - * Do we have the sigaction flag SA_NOCLDWAIT? - */ -#define HAVE_SA_NOCLDWAIT - /* * The default path separator for the platform */ diff --git a/core/combo/include/arch/linux-mips64/AndroidConfig.h b/core/combo/include/arch/linux-mips64/AndroidConfig.h index bfc0351bc..7ded3ceea 100644 --- a/core/combo/include/arch/linux-mips64/AndroidConfig.h +++ b/core/combo/include/arch/linux-mips64/AndroidConfig.h @@ -54,12 +54,6 @@ */ #define HAVE_FUTEX -/* - * Define if we already have the futex wrapper functions defined. Yes if - * compiling against bionic. - */ -#define HAVE_FUTEX_WRAPPERS 1 - /* * Process creation model. Choose one: * @@ -270,21 +264,11 @@ */ #define OS_SHARED_LIB_FORMAT_STR "lib%s.so" -/* - * Do we have __memcmp16()? - */ -#define HAVE__MEMCMP16 1 - /* * type for the third argument to mincore(). */ #define MINCORE_POINTER_TYPE unsigned char * -/* - * Do we have the sigaction flag SA_NOCLDWAIT? - */ -#define HAVE_SA_NOCLDWAIT - /* * The default path separator for the platform */ diff --git a/core/combo/include/arch/linux-ppc/AndroidConfig.h b/core/combo/include/arch/linux-ppc/AndroidConfig.h index e6f948927..27500b445 100644 --- a/core/combo/include/arch/linux-ppc/AndroidConfig.h +++ b/core/combo/include/arch/linux-ppc/AndroidConfig.h @@ -245,11 +245,6 @@ */ #define MINCORE_POINTER_TYPE unsigned char * -/* - * Do we have the sigaction flag SA_NOCLDWAIT? - */ -#define HAVE_SA_NOCLDWAIT - /* * The default path separator for the platform */ diff --git a/core/combo/include/arch/linux-x86/AndroidConfig.h b/core/combo/include/arch/linux-x86/AndroidConfig.h index 074018640..ebb95b0f0 100644 --- a/core/combo/include/arch/linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/linux-x86/AndroidConfig.h @@ -242,11 +242,6 @@ */ #define MINCORE_POINTER_TYPE unsigned char * -/* - * Do we have the sigaction flag SA_NOCLDWAIT? - */ -#define HAVE_SA_NOCLDWAIT - /* * The default path separator for the platform */ diff --git a/core/combo/include/arch/target_linux-x86/AndroidConfig.h b/core/combo/include/arch/target_linux-x86/AndroidConfig.h index f55134a13..5b56b51af 100644 --- a/core/combo/include/arch/target_linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/target_linux-x86/AndroidConfig.h @@ -40,12 +40,6 @@ */ #define HAVE_FUTEX -/* - * Define if we already have the futex wrapper functions defined. Yes if - * compiling against bionic. - */ -#define HAVE_FUTEX_WRAPPERS 1 - /* * Process creation model. Choose one: * @@ -252,21 +246,11 @@ */ #define OS_SHARED_LIB_FORMAT_STR "lib%s.so" -/* - * Do we have __memcmp16()? - */ -/* #define HAVE__MEMCMP16 1 */ - /* * type for the third argument to mincore(). */ #define MINCORE_POINTER_TYPE unsigned char * -/* - * Do we have the sigaction flag SA_NOCLDWAIT? - */ -#define HAVE_SA_NOCLDWAIT - /* * The default path separator for the platform */