Ticket #15366: gcc-4.7.3.p1.diff

SPKG.txt

@@ -28 +28 @@
 * Lots of stuff can be removed, run ./spkg-src to do this automatically
   (after downloading the sources).
 
+=== Patches ===
+ * cyggcc_s.patch: fix a bug in cyggcc_s.dll on Cygwin.
+
 == Changelog ==
 
+=== gcc-4.7.3.p1 (Jean-Pierre Flori, 6 November 2013) ===
+ * Trac #15366: fix a bug in cyggcc_s.dll on Cygwin.
+ * Taken from http://cygwin.com/ml/cygwin/2013-07/msg00528.html.
+
+=== gcc-4.7.3.p0 (Jeroen Demeyer, 11 April 2013) ===
+ * Trac #14441: upgrade to version 4.7.3.
+
 === gcc-4.7.3.p0 (Jeroen Demeyer, 11 April 2013) ===
  * Trac #14441: upgrade to version 4.7.3.
 

new file patches/cyggcc_s.patch

@@ +1 @@
+diff -druN src.orig/libgcc/config/i386/cygming-crtbegin.c src/libgcc/config/i386/cygming-crtbegin.c
+--- src.orig/libgcc/config/i386/cygming-crtbegin.c      2013-11-07 17:00:39.331879751 +0100
++++ src/libgcc/config/i386/cygming-crtbegin.c   2013-11-05 15:12:02.000000000 +0100
+@@ -82,6 +82,8 @@
+ extern void __gcc_register_frame (void);
+ extern void __gcc_deregister_frame (void);
+ 
++static HANDLE libgcc_dll;
++
+ void
+ __gcc_register_frame (void)
+ {
+@@ -94,8 +96,11 @@
+   void (*register_frame_fn) (const void *, struct object *);
+   HANDLE h = GetModuleHandle (LIBGCC_SONAME);
+   if (h)
++  {
++    libgcc_dll = LoadLibrary(LIBGCC_SONAME);
+     register_frame_fn = (void (*) (const void *, struct object *))
+                        GetProcAddress (h, "__register_frame_info");
++  }
+   else 
+     register_frame_fn = __register_frame_info;
+   if (register_frame_fn)
+@@ -124,13 +129,14 @@
+ {
+ #if DWARF2_UNWIND_INFO
+   void *  (*deregister_frame_fn) (const void *);
+-  HANDLE h = GetModuleHandle (LIBGCC_SONAME);
+-  if (h)
++  if (libgcc_dll)
+     deregister_frame_fn = (void* (*) (const void *))
+-                         GetProcAddress (h, "__deregister_frame_info");
++                         GetProcAddress (libgcc_dll, "__deregister_frame_info");
+   else 
+     deregister_frame_fn = __deregister_frame_info;
+   if (deregister_frame_fn)
+      deregister_frame_fn (__EH_FRAME_BEGIN__);
++  if (libgcc_dll)
++    FreeLibrary(libgcc_dll);
+ #endif
+ }

spkg-install

@@ -10 +10 @@
 # Exit on error
 set -e
 
+# Apply patches
+cd src/
+
+echo "Applying patches to upstream sources..."
+for patch in ../patches/*.patch; do
+    [ -r "$patch" ] || continue
+    patch -p1 <"$patch"
+    if [ $? -ne 0 ]; then
+        echo >&2 "Error: '$patch' failed to apply."
+        exit 1
+    fi
+done
+
+cd ..
+
 # Build in a separate directory, not in src/ (a.k.a. a VPATH build).
 # This is the recommended way to build GCC.
 mkdir gcc-build