From e7e7a54ed88c7b82ee27fa3de2cbed049f1d2acc Mon Sep 17 00:00:00 2001 From: fedor Date: Sun, 18 Mar 2007 04:47:04 +0000 Subject: [PATCH] Patch for ffcall on Darwin git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24894 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ config/config.trampoline.c | 2 +- configure | 4 ---- configure.ac | 4 ---- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5415ecda3..9b90e988c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-03-17 Adam Fedor + + * config/config.trampoline.c: Check for proper CPU macro for Darwin + * configure.ac: Don't enable libffi by default on Darwin + (patches from Wolfgang Lux). + 2007-03-17 Nicola Pero * SSL/GNUmakefile: Install the SSL bundle in the versioned diff --git a/config/config.trampoline.c b/config/config.trampoline.c index e27d09ae6..47d151fa7 100644 --- a/config/config.trampoline.c +++ b/config/config.trampoline.c @@ -60,7 +60,7 @@ register void* env __asm__("%r29"); #ifdef __arm__ register void* env __asm__("r12"); #endif -#ifdef __powerpc__ +#if defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) #ifdef __NetBSD__ register void* env __asm__("r13"); #else diff --git a/configure b/configure index 0b4a5591c..205a93220 100755 --- a/configure +++ b/configure @@ -15578,10 +15578,6 @@ fi # We enable ffcall by default now. #-------------------------------------------------------------------- do_enable_libffi=no -# Enable libffi by default on the following machines -case "$target_os" in - darwin*) do_enable_libffi=yes;; -esac # Check whether --enable-libffi was given. if test "${enable_libffi+set}" = set; then diff --git a/configure.ac b/configure.ac index 9fa09605f..96fffa5db 100644 --- a/configure.ac +++ b/configure.ac @@ -1804,10 +1804,6 @@ fi # We enable ffcall by default now. #-------------------------------------------------------------------- do_enable_libffi=no -# Enable libffi by default on the following machines -case "$target_os" in - darwin*) do_enable_libffi=yes;; -esac AC_ARG_ENABLE(libffi, [ --enable-libffi Enable use of libffi library],,