18 files changed, 32 insertions, 55 deletions
diff --git a/src/.svn/entries b/src/.svn/entries
index 7e514ee..9fe0cef 100644
--- a/src/.svn/entries
+++ b/src/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155499
+155537
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
@@ -26,10 +26,10 @@ dje
 
 138bc75d-0d04-0410-961f-82ee72b054a4
 
-arm
+powerpc
 dir
 
-powerpc
+arm
 dir
 
 closures.c
@@ -72,6 +72,15 @@ dir
 sh64
 dir
 
+m68k
+dir
+
+alpha
+dir
+
+x86
+dir
+
 types.c
 file
 
@@ -106,28 +115,19 @@ aph
 
 2904
 
-x86
-dir
-
-alpha
-dir
-
-m68k
+frv
 dir
 
 avr32
 dir
 
-frv
-dir
-
 s390
 dir
 
-cris
+pa
 dir
 
-pa
+cris
 dir
 
 ia64
diff --git a/src/alpha/.svn/entries b/src/alpha/.svn/entries
index 4cf47e5..4b9320d 100644
--- a/src/alpha/.svn/entries
+++ b/src/alpha/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155499
+155537
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/alpha
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/arm/.svn/entries b/src/arm/.svn/entries
index db05f03..4d27602 100644
--- a/src/arm/.svn/entries
+++ b/src/arm/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155499
+155537
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/arm
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/avr32/.svn/entries b/src/avr32/.svn/entries
index 4fae01a..09260e3 100644
--- a/src/avr32/.svn/entries
+++ b/src/avr32/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155499
+155537
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/avr32
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/closures.c b/src/closures.c
index bc087d9..0b156e0 100644
--- a/src/closures.c
+++ b/src/closures.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------
-   closures.c - Copyright (c) 2007, 2009  Red Hat, Inc.
+   closures.c - Copyright (c) 2007  Red Hat, Inc.
    Copyright (C) 2007, 2009 Free Software Foundation, Inc
 
    Code to allocate and deallocate memory for closures.
@@ -209,8 +209,6 @@ static int dlmunmap(void *, size_t);
 
 #if !(defined(X86_WIN32) || defined(X86_WIN64)) || defined (__CYGWIN__)
 
-#if FFI_MMAP_EXEC_SELINUX
-
 /* A mutex used to synchronize access to *exec* variables in this file.  */
 static pthread_mutex_t open_temp_exec_file_mutex = PTHREAD_MUTEX_INITIALIZER;
 
@@ -480,27 +478,6 @@ dlmmap (void *start, size_t length, int prot,
   return dlmmap_locked (start, length, prot, flags, offset);
 }
 
-#else
-
-static void *
-dlmmap (void *start, size_t length, int prot,
-	int flags, int fd, off_t offset)
-{
-  
-  assert (start == NULL && length % malloc_getpagesize == 0
-	  && prot == (PROT_READ | PROT_WRITE)
-	  && flags == (MAP_PRIVATE | MAP_ANONYMOUS)
-	  && fd == -1 && offset == 0);
-  
-#if FFI_CLOSURE_TEST
-  printf ("mapping in %zi\n", length);
-#endif
-  
-  return mmap (start, length, prot | PROT_EXEC, flags, fd, offset);
-}
-
-#endif
-
 /* Release memory at the given address, as well as the corresponding
    executable page if it's separate.  */
 static int
diff --git a/src/cris/.svn/entries b/src/cris/.svn/entries
index e911bc4..22751cd 100644
--- a/src/cris/.svn/entries
+++ b/src/cris/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155499
+155537
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/cris
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/frv/.svn/entries b/src/frv/.svn/entries
index bc9c85f..ab444db 100644
--- a/src/frv/.svn/entries
+++ b/src/frv/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155499
+155537
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/frv
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/ia64/.svn/entries b/src/ia64/.svn/entries
index 71f61d7..231654c 100644
--- a/src/ia64/.svn/entries
+++ b/src/ia64/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155499
+155537
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/ia64
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/m32r/.svn/entries b/src/m32r/.svn/entries
index f7867cc..d5a5a21 100644
--- a/src/m32r/.svn/entries
+++ b/src/m32r/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155499
+155537
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/m32r
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/m68k/.svn/entries b/src/m68k/.svn/entries
index dd6a413..bfe6335 100644
--- a/src/m68k/.svn/entries
+++ b/src/m68k/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155499
+155537
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/m68k
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/mips/.svn/entries b/src/mips/.svn/entries
index c9d79c9..0bb6e00 100644
--- a/src/mips/.svn/entries
+++ b/src/mips/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155499
+155537
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/mips
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/pa/.svn/entries b/src/pa/.svn/entries
index ec1aec8..f25231e 100644
--- a/src/pa/.svn/entries
+++ b/src/pa/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155499
+155537
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/pa
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/powerpc/.svn/entries b/src/powerpc/.svn/entries
index d10b5a2..d3bcaba 100644
--- a/src/powerpc/.svn/entries
+++ b/src/powerpc/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155499
+155537
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/powerpc
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/s390/.svn/entries b/src/s390/.svn/entries
index 765ce45..c8d9ece 100644
--- a/src/s390/.svn/entries
+++ b/src/s390/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155499
+155537
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/s390
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/sh/.svn/entries b/src/sh/.svn/entries
index 5d758eb..72df275 100644
--- a/src/sh/.svn/entries
+++ b/src/sh/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155499
+155537
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/sh
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/sh64/.svn/entries b/src/sh64/.svn/entries
index 2401c6a..1a84138 100644
--- a/src/sh64/.svn/entries
+++ b/src/sh64/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155499
+155537
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/sh64
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/sparc/.svn/entries b/src/sparc/.svn/entries
index 30f1377..a46b3cd 100644
--- a/src/sparc/.svn/entries
+++ b/src/sparc/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155499
+155537
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/sparc
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/x86/.svn/entries b/src/x86/.svn/entries
index c06d4dc..3348048 100644
--- a/src/x86/.svn/entries
+++ b/src/x86/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155499
+155537
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/x86
 svn+ssh://green@gcc.gnu.org/svn/gcc