From 436c73931a966c4a705d3f7b0ae7f560e1d69d86 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 18 Nov 2014 12:57:34 -0800 Subject: [PATCH] Kill unused ARCH_* defines. No one's using ARCH_AARCH64 or AARCH_MIPS64 yet, and ARCH_PPC was always more aspirational than real. Change-Id: I07c6cbad6eb0917c4c24848a98c3bc9a3fe72db6 --- core/combo/include/arch/darwin-x86/AndroidConfig.h | 6 +----- core/combo/include/arch/linux-arm64/AndroidConfig.h | 5 ----- core/combo/include/arch/linux-mips64/AndroidConfig.h | 5 ----- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/core/combo/include/arch/darwin-x86/AndroidConfig.h b/core/combo/include/arch/darwin-x86/AndroidConfig.h index b77d7513b..c83c54ccf 100644 --- a/core/combo/include/arch/darwin-x86/AndroidConfig.h +++ b/core/combo/include/arch/darwin-x86/AndroidConfig.h @@ -101,11 +101,7 @@ /* * What CPU architecture does this platform use? */ -#if (defined(__ppc__) || defined(__ppc64__)) -# define ARCH_PPC -#elif (defined(__i386__) || defined(__x86_64__)) -# define ARCH_X86 -#endif +#define ARCH_X86 /* * sprintf() format string for shared library naming. diff --git a/core/combo/include/arch/linux-arm64/AndroidConfig.h b/core/combo/include/arch/linux-arm64/AndroidConfig.h index c98ccdd05..e4f98e017 100644 --- a/core/combo/include/arch/linux-arm64/AndroidConfig.h +++ b/core/combo/include/arch/linux-arm64/AndroidConfig.h @@ -96,11 +96,6 @@ #define HAVE_LIBC_SYSTEM_PROPERTIES 1 /* - * What CPU architecture does this platform use? - */ -#define ARCH_AARCH64 - -/* * sprintf() format string for shared library naming. */ #define OS_SHARED_LIB_FORMAT_STR "lib%s.so" diff --git a/core/combo/include/arch/linux-mips64/AndroidConfig.h b/core/combo/include/arch/linux-mips64/AndroidConfig.h index 8467d0408..3d258ea89 100644 --- a/core/combo/include/arch/linux-mips64/AndroidConfig.h +++ b/core/combo/include/arch/linux-mips64/AndroidConfig.h @@ -112,11 +112,6 @@ /* #define HAVE_SYSTEM_PROPERTY_SERVER */ /* - * What CPU architecture does this platform use? - */ -#define ARCH_MIPS64 1 - -/* * sprintf() format string for shared library naming. */ #define OS_SHARED_LIB_FORMAT_STR "lib%s.so" -- 2.11.0