Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 519401 js-ctypes failed to compile on Solaris with Sun Studio compiler r=dwitte

Browse Source
This commit is contained in:
Ginn Chen 2009-12-01 20:41:52 +08:00
parent c541afff4f
commit 56aa915b4b
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.in
View File

@ -8405,7 +8405,16 @@ if test "$BUILD_CTYPES"; then
if test -n "$CROSS_COMPILE"; then
ac_configure_args="$ac_configure_args --build=$build --host=$target"
fi
AC_OUTPUT_SUBDIRS(js/ctypes/libffi)
if test "$SOLARIS_SUNPRO_CC"; then
# Always use gcc for libffi on Solaris
old_cache_file=$cache_file
cache_file=js/ctypes/libffi/config.cache
ac_configure_args="$ac_configure_args CC=gcc"
AC_OUTPUT_SUBDIRS(js/ctypes/libffi)
cache_file=$old_cache_file
else
AC_OUTPUT_SUBDIRS(js/ctypes/libffi)
fi
ac_configure_args="$_SUBDIR_CONFIG_ARGS"
fi
fi

8
js/ctypes/libffi/src/x86/ffitarget.h
View File

@ -31,7 +31,7 @@
/* ---- System specific configurations ----------------------------------- */
#if defined (X86_64) && defined (__i386__)
#if defined (X86_64) && (defined (__i386__) || defined(__i386))
#undef X86_64
#define X86
#endif
@ -54,10 +54,10 @@ typedef enum ffi_abi {
#endif
/* ---- Intel x86 and AMD x86-64 - */
#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__))
#if !defined(X86_WIN32) && (defined(__i386__) || defined(__i386) || defined(__x86_64__) || defined(__x86_64))
FFI_SYSV,
FFI_UNIX64, /* Unix variants all use the same ABI for x86-64 */
#ifdef __i386__
#if defined(__i386__) || defined(__i386)
FFI_DEFAULT_ABI = FFI_SYSV,
#else
FFI_DEFAULT_ABI = FFI_UNIX64,
@ -74,7 +74,7 @@ typedef enum ffi_abi {
#define FFI_TYPE_SMALL_STRUCT_1B (FFI_TYPE_LAST + 1)
#define FFI_TYPE_SMALL_STRUCT_2B (FFI_TYPE_LAST + 2)
#if defined (X86_64) || (defined (__x86_64__) && defined (X86_DARWIN))
#if defined (X86_64) || ((defined (__x86_64__) || defined (__x86_64)) && defined (X86_DARWIN))
#define FFI_TRAMPOLINE_SIZE 24
#define FFI_NATIVE_RAW_API 0
#else