[ros-diffs] [arty] 29072: Fixen for PPC. Exclude relocation. We'll be situated properly by the ELF layer anyway, and it's x86 specific. Tweak definitions in _mingw.h

[arty at svn.reactos.org]

Author: arty
Date: Mon Sep 17 09:33:08 2007
New Revision: 29072

URL: http://svn.reactos.org/svn/reactos?rev=29072&view=rev
Log:
Fixen for PPC.
Exclude relocation.  We'll be situated properly by the ELF layer anyway, and
it's x86 specific.
Tweak definitions in _mingw.h

Modified:
    trunk/reactos/lib/3rdparty/mingw/crt1.c
    trunk/reactos/lib/3rdparty/mingw/include/_mingw.h
    trunk/reactos/lib/3rdparty/mingw/mingw.rbuild
    trunk/reactos/lib/3rdparty/mingw/wcrt1.c

Modified: trunk/reactos/lib/3rdparty/mingw/crt1.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crt1.c?rev=29072&r1=29071&r2=29072&view=diff
==============================================================================
--- trunk/reactos/lib/3rdparty/mingw/crt1.c (original)
+++ trunk/reactos/lib/3rdparty/mingw/crt1.c Mon Sep 17 09:33:08 2007
@@ -41,7 +41,10 @@
 #define __UNKNOWN_APP    0
 #define __CONSOLE_APP    1
 #define __GUI_APP        2
-__MINGW_IMPORT void __set_app_type(int);
+#ifndef _M_PPC
+__MINGW_IMPORT
+#endif
+void __set_app_type(int);
 #endif /* __MSVCRT__ */
 
 /*  Global _fmode for this .exe, not the one in msvcrt.dll,
@@ -213,7 +216,9 @@
   _mingw32_init_fmode ();
   
    /* Adust references to dllimported data that have non-zero offsets.  */
+#if defined(__i386__)
   _pei386_runtime_relocator ();
+#endif
 
 #if defined(__i386__)
   /* Align the stack to 16 bytes for the sake of SSE ops in main

Modified: trunk/reactos/lib/3rdparty/mingw/include/_mingw.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/include/_mingw.h?rev=29072&r1=29071&r2=29072&view=diff
==============================================================================
--- trunk/reactos/lib/3rdparty/mingw/include/_mingw.h (original)
+++ trunk/reactos/lib/3rdparty/mingw/include/_mingw.h Mon Sep 17 09:33:08 2007
@@ -72,11 +72,16 @@
 #  endif
 #  define __DECLSPEC_SUPPORTED
 # else /* __declspec */
-#  undef __DECLSPEC_SUPPORTED
-#  undef __MINGW_IMPORT
-#  ifndef _CRTIMP
+#  ifndef __PowerPC__
+#   undef __DECLSPEC_SUPPORTED
+#   undef __MINGW_IMPORT
+#   ifndef _CRTIMP
+#    define _CRTIMP
+#   endif
+#  else  /* __PowerPC__ */
+#   define __declspec(x) 
 #   define _CRTIMP
-#  endif
+#  endif /* __PowerPC__ */
 # endif /* __declspec */
 # ifndef __cdecl
 #  define __cdecl __attribute__ ((__cdecl__))

Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.rbuild?rev=29072&r1=29071&r2=29072&view=diff
==============================================================================
--- trunk/reactos/lib/3rdparty/mingw/mingw.rbuild (original)
+++ trunk/reactos/lib/3rdparty/mingw/mingw.rbuild Mon Sep 17 09:33:08 2007
@@ -14,12 +14,14 @@
 	<file>isascii.c</file>
 	<file>iscsym.c</file>
 	<file>iscsymf.c</file>
-	<file>pseudo-reloc.c</file>
 	<file>strcasecmp.c</file>
 	<file>strncasecmp.c</file>
 	<file>toascii.c</file>
 	<file>wcscmpi.c</file>
 	<file>_wgetopt.c</file>
+	<if property="ARCH" value="i386">
+	    <file>pseudo-reloc.c</file>
+	</if>
 </module>
 <module name="mingw_main" type="staticlibrary" isstartuplib="true" allowwarnings="true">
 	<include base="ReactOS">include/crt</include>

Modified: trunk/reactos/lib/3rdparty/mingw/wcrt1.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/wcrt1.c?rev=29072&r1=29071&r2=29072&view=diff
==============================================================================
--- trunk/reactos/lib/3rdparty/mingw/wcrt1.c (original)
+++ trunk/reactos/lib/3rdparty/mingw/wcrt1.c Mon Sep 17 09:33:08 2007
@@ -214,7 +214,9 @@
   _mingw32_init_fmode ();
   
    /* Adust references to dllimported data that have non-zero offsets.  */
+#if defined(__i386__)
   _pei386_runtime_relocator ();
+#endif
 
 #if defined(__i386__)
   /* Align the stack to 16 bytes for the sake of SSE ops in main