mingw-w64-headers/include/ Merged from trunk: 2010-07-19 Kai Tietz <kai.tietz@onevision.com> (rev. 4283) * _mingw_mac.h (__MINGW_IMP_LSYMBOL): New helper macro for assembly files. mingw-w64-crt/misc/ Merged from trunk rev. 4284: 2011-07-19 Kai Tietz <kai.tietz@onevision.com> * mingw_getsp.S: Fix build for unmodified gcc 4.4.x and 4.5.0 series about longjmp symbol and name decoration. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/branches/releases/v1.0@4294 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-crt/ChangeLog b/mingw-w64-crt/ChangeLog index 9d922e8..efc571c 100644 --- a/mingw-w64-crt/ChangeLog +++ b/mingw-w64-crt/ChangeLog
@@ -1,5 +1,12 @@ 2011-07-23 Ozkan Sezer <sezeroz@gmail.com> + Merged from trunk rev. 4284: + 2011-07-19 Kai Tietz <kai.tietz@onevision.com> + * mingw_getsp.S: Fix build for unmodified gcc 4.4.x and 4.5.0 series + about longjmp symbol and name decoration. + +2011-07-23 Ozkan Sezer <sezeroz@gmail.com> + * lib32/vfw32.mri: Adjust for lib32 subdirectory. * lib32/vfw64.mri: New. * Makefile.am: Generate libvfw32.a using vfw32.mri.
diff --git a/mingw-w64-crt/misc/mingw_getsp.S b/mingw-w64-crt/misc/mingw_getsp.S index 0d71c3b..3699578 100644 --- a/mingw-w64-crt/misc/mingw_getsp.S +++ b/mingw-w64-crt/misc/mingw_getsp.S
@@ -28,7 +28,7 @@ #ifdef _WIN64 xorl %eax,%eax movl %eax, (%rcx) - leaq __imp_longjmp(%rip), %rax + leaq __MINGW_IMP_LSYMBOL(longjmp)(%rip), %rax jmpq *(%rax) #else jmp *__imp__longjmp
diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog index 1ae28bb..fb0dcfe 100644 --- a/mingw-w64-headers/include/ChangeLog +++ b/mingw-w64-headers/include/ChangeLog
@@ -1,5 +1,12 @@ 2011-07-23 Ozkan Sezer <sezeroz@gmail.com> + Merged from trunk: + 2010-07-19 Kai Tietz <kai.tietz@onevision.com> (rev. 4283) + * _mingw_mac.h (__MINGW_IMP_LSYMBOL): New helper macro for assembly + files. + +2011-07-23 Ozkan Sezer <sezeroz@gmail.com> + * winnt.h (C_ASSERT): Revert the EXTERN_C change from rev.4285/4286. * usbioctl.h: Remove the extern "C" {} from the header completely. There are no functions or variables are declared, only data types,
diff --git a/mingw-w64-headers/include/_mingw_mac.h b/mingw-w64-headers/include/_mingw_mac.h index 9ee1726..315f32c 100644 --- a/mingw-w64-headers/include/_mingw_mac.h +++ b/mingw-w64-headers/include/_mingw_mac.h
@@ -51,10 +51,12 @@ #if __MINGW_USE_UNDERSCORE_PREFIX == 0 #define __MINGW_IMP_SYMBOL(sym) __imp_##sym +#define __MINGW_IMP_LSYMBOL(sym) __imp_##sym #define __MINGW_USYMBOL(sym) sym #define __MINGW_LSYMBOL(sym) _##sym #else #define __MINGW_IMP_SYMBOL(sym) _imp__##sym +#define __MINGW_IMP_LSYMBOL(sym) __imp__##sym #define __MINGW_USYMBOL(sym) _##sym #define __MINGW_LSYMBOL(sym) sym #endif