2003/09/26 02:54:05

darcs-hash:20040130073644-2ba56-f382bde2328969a89c698b4be017241069ae4775.gz

diff --git a/upstream/gcc-3.3/patches/darwin-gc.patch b/upstream/gcc-3.3/patches/darwin-gc.patch
index 6ffbd20..26f0942 100644 (file)
--- a/upstream/gcc-3.3/patches/darwin-gc.patch
+++ b/upstream/gcc-3.3/patches/darwin-gc.patch
@@ -1368,7 +1368,7 @@ diff -buNr boehm-gc/alpha_mach_dep.s boehm-gc/alpha_mach_dep.s
 --- boehm-gc/alpha_mach_dep.s  Fri Aug 17 11:30:45 2001
 +++ boehm-gc/alpha_mach_dep.s  Sat Sep 13 02:10:15 2003
 @@ -1,3 +1,4 @@
 --- boehm-gc/alpha_mach_dep.s  Fri Aug 17 11:30:45 2001
 +++ boehm-gc/alpha_mach_dep.s  Sat Sep 13 02:10:15 2003
 @@ -1,3 +1,4 @@

-+ # $Id: darwin-gc.patch,v 1.3 2003/09/15 02:37:45 megacz Exp $
++ # $Id: darwin-gc.patch,v 1.4 2003/09/26 01:54:05 megacz Exp $

        .arch ev6
  
          .text
        .arch ev6
  
          .text

@@ -27263,9 +27263,9 @@ diff -buNr boehm-gc/version.h boehm-gc/version.h
  
  #ifndef GC_NO_VERSION_VAR
  
  
  #ifndef GC_NO_VERSION_VAR
  

-diff -buNr boehm-gc/win32_threads.c boehm-gc/win32_threads.c
---- boehm-gc/win32_threads.c   Mon Apr 28 13:55:07 2003
-+++ boehm-gc/win32_threads.c   Sat Sep 13 02:10:15 2003
+ 
+--- /tmp/gcc-3.3/boehm-gc/win32_threads.c      Mon Apr 28 13:55:07 2003
++++ upstream/gcc-3.3/src/boehm-gc/win32_threads.c      Thu Sep 25 05:31:33 2003

 @@ -2,12 +2,26 @@
  
  #include "private/gc_priv.h"
 @@ -2,12 +2,26 @@
  
  #include "private/gc_priv.h"

@@ -27376,6 +27376,15 @@ diff -buNr boehm-gc/win32_threads.c boehm-gc/win32_threads.c
  
  typedef struct {
      HANDLE child_ready_h, parent_ready_h;
  
  typedef struct {
      HANDLE child_ready_h, parent_ready_h;

+@@ -357,7 +396,7 @@
+ 
+ DWORD WINAPI thread_start(LPVOID arg);
+ 
+-HANDLE WINAPI GC_CreateThread(
++HANDLE GC_CreateThread(
+     LPSECURITY_ATTRIBUTES lpThreadAttributes, 
+     DWORD dwStackSize, LPTHREAD_START_ROUTINE lpStartAddress, 
+     LPVOID lpParameter, DWORD dwCreationFlags, LPDWORD lpThreadId )

 @@ -527,22 +566,11 @@
  
  LONG WINAPI GC_write_fault_handler(struct _EXCEPTION_POINTERS *exc_info);
 @@ -527,22 +566,11 @@
  
  LONG WINAPI GC_write_fault_handler(struct _EXCEPTION_POINTERS *exc_info);