mirror of
https://github.com/reactos/reactos.git
synced 2025-02-24 17:34:57 +00:00
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 svn path=/trunk/; revision=29072
This commit is contained in:
parent
e366497b95
commit
028b640f0b
4 changed files with 20 additions and 6 deletions
7
reactos/lib/3rdparty/mingw/crt1.c
vendored
7
reactos/lib/3rdparty/mingw/crt1.c
vendored
|
@ -41,7 +41,10 @@ extern int main (int, char **, char **);
|
|||
#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 @@ __mingw_CRTStartup (void)
|
|||
_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
|
||||
|
|
5
reactos/lib/3rdparty/mingw/include/_mingw.h
vendored
5
reactos/lib/3rdparty/mingw/include/_mingw.h
vendored
|
@ -72,11 +72,16 @@
|
|||
# endif
|
||||
# define __DECLSPEC_SUPPORTED
|
||||
# else /* __declspec */
|
||||
# ifndef __PowerPC__
|
||||
# undef __DECLSPEC_SUPPORTED
|
||||
# undef __MINGW_IMPORT
|
||||
# ifndef _CRTIMP
|
||||
# define _CRTIMP
|
||||
# endif
|
||||
# else /* __PowerPC__ */
|
||||
# define __declspec(x)
|
||||
# define _CRTIMP
|
||||
# endif /* __PowerPC__ */
|
||||
# endif /* __declspec */
|
||||
# ifndef __cdecl
|
||||
# define __cdecl __attribute__ ((__cdecl__))
|
||||
|
|
4
reactos/lib/3rdparty/mingw/mingw.rbuild
vendored
4
reactos/lib/3rdparty/mingw/mingw.rbuild
vendored
|
@ -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>
|
||||
|
|
2
reactos/lib/3rdparty/mingw/wcrt1.c
vendored
2
reactos/lib/3rdparty/mingw/wcrt1.c
vendored
|
@ -214,7 +214,9 @@ __mingw_wCRTStartup (void)
|
|||
_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
|
||||
|
|
Loading…
Reference in a new issue