cygwin fix & updates for 3.0.13

diff --git a/ChangeLog b/ChangeLog
index 6c8ea2bbc41051b2132b2ad83ca3352557a02d1d..e0b057c79a49b215f49c407057216609e815cc6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+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.

diff --git a/README b/README
index e89d419996d8fa69e72788b8f9eff305d0ad0f36..a9c053f036a6e9721310930c02e8bab2739d48f0 100644 (file)
--- 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 7887647f88e42aaaa60a887515057b4b5bb36de8..6d5acf830ac97ec0f11923d3e9808477900c8e29 100644 (file)
--- 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
 
 \1f
 Tag Table:
-Node: Top\7f698
-Node: Introduction\7f1446
-Node: Using libffi\7f3082
-Node: The Basics\7f3568
-Node: Simple Example\7f7210
-Node: Types\7f8237
-Node: Primitive Types\7f8520
-Node: Structures\7f10340
-Node: Type Example\7f11210
-Node: Multiple ABIs\7f12433
-Node: The Closure API\7f12804
-Node: Closure Example\7f15748
-Node: Missing Features\7f17307
-Node: Index\7f17760
+Node: Top\7f712
+Node: Introduction\7f1460
+Node: Using libffi\7f3096
+Node: The Basics\7f3582
+Node: Simple Example\7f7224
+Node: Types\7f8251
+Node: Primitive Types\7f8534
+Node: Structures\7f10354
+Node: Type Example\7f11224
+Node: Multiple ABIs\7f12447
+Node: The Closure API\7f12818
+Node: Closure Example\7f15762
+Node: Missing Features\7f17321
+Node: Index\7f17774
 \1f
 End Tag Table

diff --git a/doc/stamp-vti b/doc/stamp-vti
index 369e368f19df954158245addc2f43e5ead4114a6..27f9879422cbd849eeea1e411cacd5f041ac5cba 100644 (file)
--- 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 369e368f19df954158245addc2f43e5ead4114a6..27f9879422cbd849eeea1e411cacd5f041ac5cba 100644 (file)
--- 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 fecbc4ae2c9e7056e84c2561f6537e453ea7efc7..6298d6f0c4de8cb2fa23897949b1e63233597787 100644 (file)
--- 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*);