Index: src/w32api/include/winnt.h
===================================================================
--- src/w32api/include/winnt.h	(revision 1238)
+++ src/w32api/include/winnt.h	(working copy)
@@ -97,6 +97,9 @@
 #define _WCHAR_T_DEFINED
 #ifndef _WCHAR_T_
 #define _WCHAR_T_
+#ifndef _WCHAR_T
+#define _WCHAR_T
+#endif
 #undef __need_wchar_t
 #ifndef __cplusplus
 typedef unsigned short wchar_t;
@@ -3963,7 +3966,9 @@
 #endif /* _WIN32_WCE */
 
 #ifdef _WIN32_WCE
+#ifndef _SIZE_T
 typedef unsigned int size_t;
+#endif
 #ifndef offsetof
 #define offsetof(type, ident) ((size_t)&(((type*)0)->ident))
 #endif
Index: src/w32api/include/winuser.h
===================================================================
--- src/w32api/include/winuser.h	(revision 1238)
+++ src/w32api/include/winuser.h	(working copy)
@@ -3724,7 +3724,8 @@
 WINUSERAPI int WINAPI GetKeyNameTextW(LONG,LPWSTR,int);
 WINUSERAPI SHORT WINAPI GetKeyState(int);
 WINUSERAPI HWND WINAPI GetLastActivePopup(HWND);
-WINUSERAPI HMENU WINAPI GetMenu(HWND);
+/* WINUSERAPI HMENU WINAPI GetMenu(HWND); */
+#define GetMenu(x) (NULL)
 WINUSERAPI LONG WINAPI GetMenuCheckMarkDimensions(void);
 WINUSERAPI DWORD WINAPI GetMenuContextHelpId(HMENU);
 WINUSERAPI UINT WINAPI GetMenuDefaultItem(HMENU,UINT,UINT);
Index: src/binutils/ld/deffilep.y
===================================================================
--- src/binutils/ld/deffilep.y	(revision 1238)
+++ src/binutils/ld/deffilep.y	(working copy)
@@ -104,7 +104,8 @@
   int number;
 };
 
-%token NAME LIBRARY DESCRIPTION STACKSIZE HEAPSIZE CODE DATAU DATAL
+/* %token NAME LIBRARY DESCRIPTION STACKSIZE HEAPSIZE CODE DATAU DATAL */
+%token NAME LIBRARY DESCRIPTION HEAPSIZE CODE DATAU DATAL
 %token SECTIONS EXPORTS IMPORTS VERSIONK BASE CONSTANTU CONSTANTL
 %token PRIVATEU PRIVATEL
 %token READ WRITE EXECUTE SHARED NONAMEU NONAMEL DIRECTIVE
@@ -124,7 +125,7 @@
 		NAME opt_name opt_base { def_image_name ($2, $3, 0); }
 	|	LIBRARY opt_name opt_base { def_image_name ($2, $3, 1); }
 	|	DESCRIPTION ID { def_description ($2);}
-	|	STACKSIZE NUMBER opt_number { def_stacksize ($2, $3);}
+/*	|	STACKSIZE NUMBER opt_number { def_stacksize ($2, $3);} */
 	|	HEAPSIZE NUMBER opt_number { def_heapsize ($2, $3);}
 	|	CODE attr_list { def_section ("CODE", $2);}
 	|	DATAU attr_list  { def_section ("DATA", $2);}
Index: src/gcc/gcc/config/rs6000/host-darwin.c
===================================================================
--- src/gcc/gcc/config/rs6000/host-darwin.c	(revision 1238)
+++ src/gcc/gcc/config/rs6000/host-darwin.c	(working copy)
@@ -35,7 +35,9 @@
 
 /* This doesn't have a prototype in signal.h in 10.2.x and earlier,
    fixed in later releases.  */
+#ifndef __DARWIN_UNIX03
 extern int sigaltstack(const struct sigaltstack *, struct sigaltstack *);
+#endif
 
 #undef HOST_HOOKS_EXTRA_SIGNALS
 #define HOST_HOOKS_EXTRA_SIGNALS darwin_rs6000_extra_signals
@@ -68,7 +70,11 @@
   sigaddset (&sigset, SIGSEGV);
   sigprocmask (SIG_UNBLOCK, &sigset, NULL);
 
+#if __DARWIN_UNIX03
+  faulting_insn = *(unsigned *)uc->uc_mcontext->__ss.__srr0;
+#else
   faulting_insn = *(unsigned *)uc->uc_mcontext->ss.srr0;
+#endif
 
   /* Note that this only has to work for GCC, so we don't have to deal
      with all the possible cases (GCC has no AltiVec code, for
@@ -115,9 +121,13 @@
 
       exit (FATAL_EXIT_CODE);
     }
-
+#if __DARWIN_UNIX03
+  fprintf (stderr, "[address=%08lx pc=%08x]\n",
+	   uc->uc_mcontext->__es.__dar, uc->uc_mcontext->__ss.__srr0);
+#else
   fprintf (stderr, "[address=%08lx pc=%08x]\n", 
 	   uc->uc_mcontext->es.dar, uc->uc_mcontext->ss.srr0);
+#endif
   internal_error ("Segmentation Fault");
   exit (FATAL_EXIT_CODE);
 }