Please ignore patch 003 which adds __initenv to msvcrt This is not available on arm. Please review this along with the NtCurrentTeb patch.
Apologies for the noise Kind Regards Martell On Tue, Dec 15, 2015 at 10:37 PM, Martell Malone <[email protected]> wrote: > Forgot: Please Review. :) > > On Tue, Dec 15, 2015 at 10:37 PM, Martell Malone <[email protected]> > wrote: > >> Add the final 2 functions need to run are executables via mingw-w64. >> > >
From 73f31eabfba4d9adcfd3c8999bb97f3585ea8ee1 Mon Sep 17 00:00:00 2001 From: Martell Malone <[email protected]> Date: Tue, 15 Dec 2015 23:03:05 -0800 Subject: [PATCH] crt: armv7 does not have __initenv in libmsvcrt diff --git a/mingw-w64-crt/crt/crtexe.c b/mingw-w64-crt/crt/crtexe.c index 6a2e2c7..ae37e0f 100644 --- a/mingw-w64-crt/crt/crtexe.c +++ b/mingw-w64-crt/crt/crtexe.c @@ -26,7 +26,7 @@ extern wchar_t *** __MINGW_IMP_SYMBOL(__winitenv); #define __winitenv (* __MINGW_IMP_SYMBOL(__winitenv)) #endif -#ifndef __initenv +#if !defined(__initenv) && !defined(__arm__) extern char *** __MINGW_IMP_SYMBOL(__initenv); #define __initenv (* __MINGW_IMP_SYMBOL(__initenv)) #endif @@ -328,7 +328,9 @@ __tmainCRTStartup (void) gcc inserts this call automatically for a function called main, but not for wmain. */ mainret = wmain (argc, argv, envp); #else +#ifndef __arm__ __initenv = envp; +#endif mainret = main (argc, argv, envp); #endif if (!managedapp) diff --git a/mingw-w64-crt/include/internal.h b/mingw-w64-crt/include/internal.h index c6cc796..03fe1c1 100644 --- a/mingw-w64-crt/include/internal.h +++ b/mingw-w64-crt/include/internal.h @@ -114,7 +114,7 @@ extern wchar_t *** __MINGW_IMP_SYMBOL(__winitenv); #define __winitenv (* __MINGW_IMP_SYMBOL(__winitenv)) #endif -#ifndef __initenv +#if !defined(__initenv) && !defined(__arm__) extern char *** __MINGW_IMP_SYMBOL(__initenv); #define __initenv (* __MINGW_IMP_SYMBOL(__initenv)) #endif -- 2.6.3
------------------------------------------------------------------------------
_______________________________________________ Mingw-w64-public mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
