Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-27 15:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MINGW]

Browse source 
Don't define __ImageBase to something else on MSVC builds

svn path=/branches/cmake-bringup/; revision=49505
This commit is contained in:
Timo Kreuzer 2010-11-06 00:25:57 +00:00
parent 117bdf56ae
commit d46d983c8f
4 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/3rdparty/mingw/crt_handler.c vendored
View file

@ -16,7 +16,9 @@
#if defined (_WIN64) && defined (__ia64__) #if defined (_WIN64) && defined (__ia64__)
#error FIXME: Unsupported __ImageBase implementation. #error FIXME: Unsupported __ImageBase implementation.
#else #else
#ifndef _MSC_VER
#define __ImageBase __MINGW_LSYMBOL(_image_base__) #define __ImageBase __MINGW_LSYMBOL(_image_base__)
#endif
/* This symbol is defined by the linker. */ /* This symbol is defined by the linker. */
extern IMAGE_DOS_HEADER __ImageBase; extern IMAGE_DOS_HEADER __ImageBase;
#endif #endif

3
lib/3rdparty/mingw/crtexe.c vendored
View file

@ -33,7 +33,10 @@ extern char *** __MINGW_IMP_SYMBOL(__initenv);
#endif #endif
/* Hack, for bug in ld. Will be removed soon. */ /* Hack, for bug in ld. Will be removed soon. */
#ifndef _MSC_VER
#define __ImageBase __MINGW_LSYMBOL(_image_base__) #define __ImageBase __MINGW_LSYMBOL(_image_base__)
#endif
/* This symbol is defined by ld. */ /* This symbol is defined by ld. */
extern IMAGE_DOS_HEADER __ImageBase; extern IMAGE_DOS_HEADER __ImageBase;

2
lib/3rdparty/mingw/pesect.c vendored
View file

@ -11,7 +11,9 @@
#error FIXME: Unsupported __ImageBase implementation. #error FIXME: Unsupported __ImageBase implementation.
#else #else
/* Hack, for bug in ld. Will be removed soon. */ /* Hack, for bug in ld. Will be removed soon. */
#ifndef _MSC_VER
#define __ImageBase __MINGW_LSYMBOL(_image_base__) #define __ImageBase __MINGW_LSYMBOL(_image_base__)
#endif
/* This symbol is defined by the linker. */ /* This symbol is defined by the linker. */
extern IMAGE_DOS_HEADER __ImageBase; extern IMAGE_DOS_HEADER __ImageBase;
#endif #endif

7
lib/3rdparty/mingw/pseudo-reloc.c vendored
View file

@ -46,7 +46,10 @@
extern char __RUNTIME_PSEUDO_RELOC_LIST__; extern char __RUNTIME_PSEUDO_RELOC_LIST__;
extern char __RUNTIME_PSEUDO_RELOC_LIST_END__; extern char __RUNTIME_PSEUDO_RELOC_LIST_END__;
extern char __MINGW_LSYMBOL(_image_base__); #ifndef _MSC_VER
#define __ImageBase __MINGW_LSYMBOL(_image_base__)
#endif
extern char __ImageBase;
void _pei386_runtime_relocator (void); void _pei386_runtime_relocator (void);
@ -363,5 +366,5 @@ _pei386_runtime_relocator (void)
++was_init; ++was_init;
do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__, do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__,
&__RUNTIME_PSEUDO_RELOC_LIST_END__, &__RUNTIME_PSEUDO_RELOC_LIST_END__,
&__MINGW_LSYMBOL(_image_base__)); &__ImageBase);
} }