diff options
author | David Turner <digit@android.com> | 2010-10-13 08:51:40 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2010-10-13 08:51:40 -0700 |
commit | 3c9dce795d3c7c577604cbb3f89b5d6afa610ff9 (patch) | |
tree | 0289586e6a72c8363dd83a8b37da2033d48418ed /android | |
parent | 00fa926bdd4c7d169f1124b6029234dcc254bc1f (diff) | |
parent | 065aceec615663a19e50aacf88867bc6aa10b0e6 (diff) | |
download | external_qemu-3c9dce795d3c7c577604cbb3f89b5d6afa610ff9.zip external_qemu-3c9dce795d3c7c577604cbb3f89b5d6afa610ff9.tar.gz external_qemu-3c9dce795d3c7c577604cbb3f89b5d6afa610ff9.tar.bz2 |
Merge changes Ieab04778,Idb0e3c52,I3f426352,Ied07f9db
* changes:
Don't build MMX stuff on PowerPC
Add SDL_config.h for PPC (generated by android-configure.sh)
Add config-host.h for PPC (generated by android-configure.sh)
Fix detection of host endianness
Diffstat (limited to 'android')
-rw-r--r-- | android/config/linux-ppc/SDL_config.h | 123 | ||||
-rw-r--r-- | android/config/linux-ppc/config-host.h | 18 |
2 files changed, 141 insertions, 0 deletions
diff --git a/android/config/linux-ppc/SDL_config.h b/android/config/linux-ppc/SDL_config.h new file mode 100644 index 0000000..a5cc0aa --- /dev/null +++ b/android/config/linux-ppc/SDL_config.h @@ -0,0 +1,123 @@ +/* This file was autogenerated by 'android-configure.sh' - do not edit */ +#ifndef _SDL_config_h +#define _SDL_config_h + +#include "SDL_platform.h" + +#define SDL_HAS_64BIT_TYPE 1 +#define SDL_BYTEORDER 4321 + +#define HAVE_LIBC 1 +#if HAVE_LIBC + +/* Useful headers */ +#define HAVE_ALLOCA_H 1 +#define HAVE_SYS_TYPES_H 1 +#define HAVE_STDIO_H 1 +#define STDC_HEADERS 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STDARG_H 1 +#define HAVE_MALLOC_H 1 +#define HAVE_MEMORY_H 1 +#define HAVE_STRING_H 1 +#define HAVE_STRINGS_H 1 +#define HAVE_INTTYPES_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_CTYPE_H 1 +#define HAVE_MATH_H 1 +#define HAVE_ICONV_H 1 +#define HAVE_SIGNAL_H 1 +/* #undef HAVE_ALTIVEC_H */ +/* C library functions */ +#define HAVE_MALLOC 1 +#define HAVE_CALLOC 1 +#define HAVE_REALLOC 1 +#define HAVE_FREE 1 +/* #undef HAVE_ALLOC */ +#ifndef _WIN32 /* Don't use on Windows */ +#define HAVE_GETENV 1 +#define HAVE_PUTENV 1 +#define HAVE_UNSETENV 1 +#endif +#define HAVE_QSORT 1 +#define HAVE_ABS 1 +#define HAVE_BCOPY 1 +#define HAVE_MEMSET 1 +#define HAVE_MEMCPY 1 +#define HAVE_MEMMOVE 1 +#define HAVE_MEMCMP 1 +#define HAVE_STRLEN 1 +/* #undef HAVE_STRLCPY */ +/* #undef HAVE_STRLCAT */ +#define HAVE_STRDUP 1 +/* #undef HAVE__STRREV */ +/* #undef HAVE__STRUPR */ +/* #undef HAVE__STRLWR */ +#define HAVE_INDEX 1 +#define HAVE_RINDEX 1 +#define HAVE_STRCHR 1 +#define HAVE_STRRCHR 1 +/* #undef HAVE_ITOA */ +/* #undef HAVE__LTOA */ +/* #undef HAVE__UITOA */ +/* #undef HAVE__ULTOA */ +#define HAVE_STRTOL 1 +#define HAVE_STRTOUL 1 +/* #undef HAVE__I64TOA */ +/* #undef HAVE__UI64TOA */ +#define HAVE_STRTOLL 1 +#define HAVE_STRTOULL 1 +#define HAVE_STRTOD 1 +#define HAVE_ATOI 1 +#define HAVE_ATOF 1 +#define HAVE_STRCMP 1 +#define HAVE_STRNCMP 1 +/* #undef HAVE__STRICMP */ +#define HAVE_STRCASECMP 1 +/* #undef HAVE__STRNICMP */ +#define HAVE_VSNPRINTF 1 +#define HAVE_ICONV 1 +#define HAVE_SIGACTION 1 +#define HAVE_SETJMP 1 +#define HAVE_NANOSLEEP 1 +#define HAVE_CLOCK_GETTIME 1 +#define HAVE_DLVSYM 1 +#define HAVE_GETPAGESIZE 1 +#else +/* We may need some replacement for stdarg.h here */ +#include <stdarg.h> +#endif /* HAVE_LIBC */ + +/* Allow disabling of core subsystems */ +#define SDL_AUDIO_DISABLED 1 +#define SDL_CDROM_DISABLED 1 +/* #undef SDL_CPUINFO_DISABLED */ +/* #undef SDL_EVENTS_DISABLED */ +#define SDL_FILE_DISABLED 1 +#define SDL_JOYSTICK_DISABLED 1 +/* #undef SDL_LOADSO_DISABLED */ +/* #undef SDL_THREADS_DISABLED */ +/* #undef SDL_TIMERS_DISABLED */ +/* #undef SDL_VIDEO_DISABLED */ + +/* Enable various shared object loading systems */ +#define SDL_LOADSO_DLOPEN 1 + +/* Enable various threading systems */ +#define SDL_THREAD_PTHREAD 1 +#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP 1 + +/* Enable various timer systems */ +#define SDL_TIMER_UNIX 1 + +/* Enable various video drivers */ +#define SDL_VIDEO_DRIVER_X11 1 +#define SDL_VIDEO_DRIVER_X11_DPMS 1 +#define SDL_VIDEO_DRIVER_X11_XINERAMA 1 +#define SDL_VIDEO_DRIVER_X11_XME 1 +#define SDL_MAIN_DUMMY 1 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6" +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6" +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "libXrandr.so.2" +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER "libXrender.so.1" +#endif /* _SDL_config_h */ diff --git a/android/config/linux-ppc/config-host.h b/android/config/linux-ppc/config-host.h new file mode 100644 index 0000000..5f7a94f --- /dev/null +++ b/android/config/linux-ppc/config-host.h @@ -0,0 +1,18 @@ +/* This file was autogenerated by 'android-configure.sh' */ +#define CONFIG_QEMU_SHAREDIR "/usr/local/share/qemu" +#define HOST_LONG_BITS 32 +#define CONFIG_BYTESWAP_H 1 +#define CONFIG_FNMATCH 1 +#define CONFIG_GDBSTUB 1 +#define CONFIG_SLIRP 1 +#define CONFIG_SKINS 1 +#define CONFIG_TRACE 1 +#define CONFIG_FDATASYNC 1 +#define CONFIG_NAND_LIMITS 1 +#define QEMU_VERSION "0.10.50" +#define QEMU_PKGVERSION "Android" +#define HOST_PPC 1 +#define HOST_WORDS_BIGENDIAN 1 +#define CONFIG_IOVEC 1 +#define CONFIG_LINUX 1 +#define CONFIG_ANDROID 1 |