cygwin fix & updates for 3.0.13

6 files changed, 39 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index 6c8ea2b..e0b057c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2013-03-17  Anthony Green  <green@moxielogic.com>
 
+	* README: Update for 3.0.13.
+	* configure.ac: Ditto.
+	* configure: Rebuilt.
+	* doc/*: Update version.
+
+2013-03-17  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* src/closures.c (is_emutramp_enabled
+	[!FFI_MMAP_EXEC_EMUTRAMP_PAX]): Move default definition outside
+	enclosing #if scope.
+
+2013-03-17  Anthony Green  <green@moxielogic.com>
+
 	* configure.ac: Only modify toolexecdir in certain cases.
 	* configure: Rebuilt.
 
diff --git a/README b/README
index e89d419..a9c053f 100644
--- a/README
+++ b/README
@@ -169,6 +169,8 @@ See the ChangeLog files for details.
 	Fix stack alignment bug on 32-bit x86.
 	Build fix for m68000 targets.
 	Build fix for soft-float Power targets.
+	Fix the install dir location for some platforms when building
+	  with GCC (OS X, Solaris).
 
 3.0.12 Feb-11-13
         Add Moxie support.
diff --git a/doc/libffi.info b/doc/libffi.info
index 7887647..6d5acf8 100644
--- a/doc/libffi.info
+++ b/doc/libffi.info
@@ -1,5 +1,5 @@
-This is ../doc/libffi.info, produced by makeinfo version 4.13 from
-../doc/libffi.texi.
+This is ../libffi/doc/libffi.info, produced by makeinfo version 4.13
+from ../libffi/doc/libffi.texi.
 
 This manual is for Libffi, a portable foreign-function interface
 library.
@@ -598,19 +598,19 @@ Index
 
 
 Tag Table:
-Node: Top698
-Node: Introduction1446
-Node: Using libffi3082
-Node: The Basics3568
-Node: Simple Example7210
-Node: Types8237
-Node: Primitive Types8520
-Node: Structures10340
-Node: Type Example11210
-Node: Multiple ABIs12433
-Node: The Closure API12804
-Node: Closure Example15748
-Node: Missing Features17307
-Node: Index17760
+Node: Top712
+Node: Introduction1460
+Node: Using libffi3096
+Node: The Basics3582
+Node: Simple Example7224
+Node: Types8251
+Node: Primitive Types8534
+Node: Structures10354
+Node: Type Example11224
+Node: Multiple ABIs12447
+Node: The Closure API12818
+Node: Closure Example15762
+Node: Missing Features17321
+Node: Index17774
 
 End Tag Table
diff --git a/doc/stamp-vti b/doc/stamp-vti
index 369e368..27f9879 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
 @set UPDATED 16 March 2013
 @set UPDATED-MONTH March 2013
-@set EDITION 3.0.13-rc1
-@set VERSION 3.0.13-rc1
+@set EDITION 3.0.13-rc2
+@set VERSION 3.0.13-rc2
diff --git a/doc/version.texi b/doc/version.texi
index 369e368..27f9879 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
 @set UPDATED 16 March 2013
 @set UPDATED-MONTH March 2013
-@set EDITION 3.0.13-rc1
-@set VERSION 3.0.13-rc1
+@set EDITION 3.0.13-rc2
+@set VERSION 3.0.13-rc2
diff --git a/src/closures.c b/src/closures.c
index fecbc4a..6298d6f 100644
--- a/src/closures.c
+++ b/src/closures.c
@@ -189,8 +189,6 @@ emutramp_enabled_check (void)
 
 #define is_emutramp_enabled() (emutramp_enabled >= 0 ? emutramp_enabled \
                                : (emutramp_enabled = emutramp_enabled_check ()))
-#else
-#define is_emutramp_enabled() 0
 #endif /* FFI_MMAP_EXEC_EMUTRAMP_PAX */
 
 #elif defined (__CYGWIN__) || defined(__INTERIX)
@@ -202,6 +200,10 @@ emutramp_enabled_check (void)
 
 #endif /* !defined(X86_WIN32) && !defined(X86_WIN64) */
 
+#ifndef FFI_MMAP_EXEC_EMUTRAMP_PAX
+#define is_emutramp_enabled() 0
+#endif /* FFI_MMAP_EXEC_EMUTRAMP_PAX */
+
 /* Declare all functions defined in dlmalloc.c as static.  */
 static void *dlmalloc(size_t);
 static void dlfree(void*);