ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mend

Browse Source
This commit is contained in:
Anthony Green
2012-01-23 13:43:38 -05:00
parent 164e6fe04b
commit cd2277cc79
4 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,7 +1,11 @@
2012-01-23 Andreas Schwab <schwab@linux-m68k.org>
* src/m68k/sysv.S (ffi_call_SYSV): Properly test for plain
mc68000. Test for __HAVE_68881__ in addition to __MC68881__.
2012-01-23 Alan Hourihane <alanh@fairlite.co.uk> 2012-01-23 Alan Hourihane <alanh@fairlite.co.uk>
* src/m68k/ffi.c (ffi_prep_closure_loc): Fix ABI check. * src/m68k/ffi.c (ffi_prep_closure_loc): Fix ABI check.
* src/m68k/sysv.S: Support 68881.
* testsuite/libffi.call/return_sc.c (main): Fix test check. * testsuite/libffi.call/return_sc.c (main): Fix test check.
2012-01-19 Jakub Jelinek <jakub@redhat.com> 2012-01-19 Jakub Jelinek <jakub@redhat.com>

2
configure.ac
View File

@@ -339,7 +339,7 @@ case "$target" in
[Cannot use PROT_EXEC on this target, so, we revert to [Cannot use PROT_EXEC on this target, so, we revert to
alternative means]) alternative means])
;; ;;
*-apple-darwin1[[10]]* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris*) *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris*)
AC_DEFINE(FFI_MMAP_EXEC_WRIT, 1, AC_DEFINE(FFI_MMAP_EXEC_WRIT, 1,
[Cannot use malloc on this target, so, we revert to [Cannot use malloc on this target, so, we revert to
alternative means]) alternative means])

17
patches/m68k-patches
View File

@@ -16,6 +16,23 @@ Index: libffi/src/m68k/sysv.S
=================================================================== ===================================================================
--- libffi.orig/src/m68k/sysv.S --- libffi.orig/src/m68k/sysv.S
+++ libffi/src/m68k/sysv.S +++ libffi/src/m68k/sysv.S
@@ -1,6 +1,6 @@
/* -----------------------------------------------------------------------
- sysv.S - Copyright (c) 1998 Andreas Schwab
+ sysv.S - Copyright (c) 1998, 2012 Andreas Schwab
Copyright (c) 2008 Red Hat, Inc.
m68k Foreign Function Interface
@@ -87,7 +87,7 @@ ffi_call_SYSV:
| If the return value pointer is NULL, assume no return value.
| NOTE: On the mc68000, tst on an address register is not supported.
-#if defined(__mc68000__) && !defined(__mcoldfire__)
+#if !defined(__mc68020__) && !defined(__mc68030__) && !defined(__mc68040__) && !defined(__mc68060__) && !defined(__mcoldfire__)
cmp.w #0, %a1
#else
tst.l %a1
@@ -109,7 +109,7 @@ retlongint: @@ -109,7 +109,7 @@ retlongint:
retfloat: retfloat:
btst #2,%d2 btst #2,%d2

4
src/m68k/sysv.S
View File

@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
sysv.S - Copyright (c) 1998 Andreas Schwab sysv.S - Copyright (c) 1998, 2012 Andreas Schwab
Copyright (c) 2008 Red Hat, Inc. Copyright (c) 2008 Red Hat, Inc.
m68k Foreign Function Interface m68k Foreign Function Interface
@@ -87,7 +87,7 @@ ffi_call_SYSV:
| If the return value pointer is NULL, assume no return value. | If the return value pointer is NULL, assume no return value.
| NOTE: On the mc68000, tst on an address register is not supported. | NOTE: On the mc68000, tst on an address register is not supported.
#if defined(__mc68000__) && !defined(__mcoldfire__) #if !defined(__mc68020__) && !defined(__mc68030__) && !defined(__mc68040__) && !defined(__mc68060__) && !defined(__mcoldfire__)
cmp.w #0, %a1 cmp.w #0, %a1
#else #else
tst.l %a1 tst.l %a1