Merge "Remove Android-added linux-sh support (not upstream)."
diff --git a/Libffi.mk b/Libffi.mk
index 139d0ce..e92fb32 100644
--- a/Libffi.mk
+++ b/Libffi.mk
@@ -26,22 +26,18 @@
LOCAL_SRC_FILES := src/arm/sysv.S src/arm/ffi.c
endif
+ifeq ($(ffi_os)-$(ffi_arch),linux-mips)
+ LOCAL_SRC_FILES += src/mips/ffi.c src/mips/o32.S
+endif
+
ifeq ($(ffi_os)-$(ffi_arch),linux-x86)
LOCAL_SRC_FILES := src/x86/ffi.c src/x86/sysv.S
endif
-ifeq ($(ffi_os)-$(ffi_arch),linux-sh)
- LOCAL_SRC_FILES := src/sh/ffi.c src/sh/sysv.S
-endif
-
ifeq ($(ffi_os)-$(ffi_arch),darwin-x86)
LOCAL_SRC_FILES := src/x86/ffi.c src/x86/darwin.S
endif
-ifeq ($(ffi_os)-$(ffi_arch),linux-mips)
- LOCAL_SRC_FILES += src/mips/ffi.c src/mips/o32.S
-endif
-
ifeq ($(LOCAL_SRC_FILES),)
$(info The os/architecture $(ffi_os)-$(ffi_arch) is not supported by libffi.)
LOCAL_SRC_FILES := your-architecture-not-supported-by-ffi-makefile.c
diff --git a/linux-sh/ffi.h b/linux-sh/ffi.h
deleted file mode 100644
index 8730a4f..0000000
--- a/linux-sh/ffi.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2008 The Android Open Source Project
- */
-#ifndef LIBFFI_H
-
-#define SH
-#include "../src/sh/ffitarget.h"
-#include "../include/ffi_real.h"
-
-#endif
diff --git a/linux-sh/fficonfig.h b/linux-sh/fficonfig.h
deleted file mode 100644
index 1055e03..0000000
--- a/linux-sh/fficonfig.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/* fficonfig.h.in. Generated from configure.ac by autoheader. */
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
- systems. This function is required for `alloca.c' support on those systems.
- */
-#undef CRAY_STACKSEG_END
-
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
-
-/* Define to the flags needed for the .section .eh_frame directive. */
-#define EH_FRAME_FLAGS "aw"
-
-/* Define this if you want extra debugging. */
-#undef FFI_DEBUG
-
-/* Define this is you do not want support for the raw API. */
-#undef FFI_NO_RAW_API
-
-/* Define this is you do not want support for aggregate types. */
-#undef FFI_NO_STRUCTS
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
- */
-#define HAVE_ALLOCA_H 1
-
-/* Define if your assembler supports .cfi_* directives. */
-#undef HAVE_AS_CFI_PSEUDO_OP
-
-/* Define if your assembler supports .register. */
-#undef HAVE_AS_REGISTER_PSEUDO_OP
-
-/* Define if your assembler and linker support unaligned PC relative relocs.
- */
-#undef HAVE_AS_SPARC_UA_PCREL
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define if __attribute__((visibility("hidden"))) is supported. */
-#undef HAVE_HIDDEN_VISIBILITY_ATTRIBUTE
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define if you have the long double type and it is bigger than a double */
-#undef HAVE_LONG_DOUBLE
-
-/* Define to 1 if you have the `memcpy' function. */
-#define HAVE_MEMCPY 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mmap' function. */
-#define HAVE_MMAP 1
-
-/* Define if mmap with MAP_ANON(YMOUS) works. */
-#define HAVE_MMAP_ANON 1
-
-/* Define if mmap of /dev/zero works. */
-#define HAVE_MMAP_DEV_ZERO 1
-
-/* Define if read-only mmap of a plain file works. */
-#define HAVE_MMAP_FILE 1
-
-/* Define if .eh_frame sections should be read-only. */
-#undef HAVE_RO_EH_FRAME
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#define HAVE_SYS_MMAN_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#define PACKAGE "libffi"
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* The size of `double', as computed by sizeof. */
-#define SIZEOF_DOUBLE 8
-
-/* The size of `long double', as computed by sizeof. */
-#undef SIZEOF_LONG_DOUBLE
-
-/* If using the C implementation of alloca, define if you know the
- direction of stack growth for your system; otherwise it will be
- automatically deduced at runtime.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define this if you are using Purify and want to suppress spurious messages.
- */
-#undef USING_PURIFY
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
-
-#ifdef HAVE_HIDDEN_VISIBILITY_ATTRIBUTE
-#ifdef LIBFFI_ASM
-#define FFI_HIDDEN(name) .hidden name
-#else
-#define FFI_HIDDEN __attribute__ ((visibility ("hidden")))
-#endif
-#else
-#ifdef LIBFFI_ASM
-#define FFI_HIDDEN(name)
-#else
-#define FFI_HIDDEN
-#endif
-#endif
-
