Hello Martin,
patch is ok. Please go ahead and commit, if Jacek has no objections.
Thanks,
Kai
2017-11-28 8:41 GMT+01:00 Martin Storsjö :
> This is necessary for msvcrt.dll on x86_64 (and arm and arm64) and
> msvcr80.dll on x86_64.
>
> This fixes building for x86_64 with msvcrt.dll since
> 9a2f3f1ca12ea76546812142f91385b3d4a374c9.
>
> Signed-off-by: Martin Storsjö
> ---
> mingw-w64-crt/Makefile.am| 16
> mingw-w64-crt/misc/__p__acmdln.c | 18 ++
> mingw-w64-crt/misc/__p__wcmdln.c | 18 ++
> 3 files changed, 48 insertions(+), 4 deletions(-)
> create mode 100644 mingw-w64-crt/misc/__p__acmdln.c
> create mode 100644 mingw-w64-crt/misc/__p__wcmdln.c
>
> diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
> index bec76e2..6812a5e 100644
> --- a/mingw-w64-crt/Makefile.am
> +++ b/mingw-w64-crt/Makefile.am
> @@ -226,19 +226,27 @@ src_msvcrt32=\
>
> src_msvcrt64=\
>$(src_msvcrt) \
> - misc/__p___argv.c
> + misc/__p___argv.c \
> + misc/__p__acmdln.c \
> + misc/__p__wcmdln.c
>
> src_msvcrtarm32=\
>$(src_msvcrt) \
> - misc/__p___argv.c
> + misc/__p___argv.c \
> + misc/__p__acmdln.c \
> + misc/__p__wcmdln.c
>
> src_msvcrtarm64=\
>$(src_msvcrt) \
> - misc/__p___argv.c
> + misc/__p___argv.c \
> + misc/__p__acmdln.c \
> + misc/__p__wcmdln.c
>
> src_msvcr80_64=\
>$(src_msvcrt_common) \
> - misc/__p___argv.c
> + misc/__p___argv.c \
> + misc/__p__acmdln.c \
> + misc/__p__wcmdln.c
>
> # These mingwex sources are target independent:
> src_libmingwex=\
> diff --git a/mingw-w64-crt/misc/__p__acmdln.c
> b/mingw-w64-crt/misc/__p__acmdln.c
> new file mode 100644
> index 000..14e3868
> --- /dev/null
> +++ b/mingw-w64-crt/misc/__p__acmdln.c
> @@ -0,0 +1,18 @@
> +/**
> + * This file has no copyright assigned and is placed in the Public Domain.
> + * This file is part of the mingw-w64 runtime package.
> + * No warranty is given; refer to the file DISCLAIMER.PD within this package.
> + */
> +
> +#include <_mingw.h>
> +
> +extern char ** __MINGW_IMP_SYMBOL(_acmdln);
> +
> +char **__cdecl __p__acmdln(void);
> +char **__cdecl __p__acmdln(void)
> +{
> +return __MINGW_IMP_SYMBOL(_acmdln);
> +}
> +
> +typedef char **__cdecl (*_f__p__acmdln)(void);
> +_f__p__acmdln __MINGW_IMP_SYMBOL(__p__acmdln) = __p__acmdln;
> diff --git a/mingw-w64-crt/misc/__p__wcmdln.c
> b/mingw-w64-crt/misc/__p__wcmdln.c
> new file mode 100644
> index 000..f343904
> --- /dev/null
> +++ b/mingw-w64-crt/misc/__p__wcmdln.c
> @@ -0,0 +1,18 @@
> +/**
> + * This file has no copyright assigned and is placed in the Public Domain.
> + * This file is part of the mingw-w64 runtime package.
> + * No warranty is given; refer to the file DISCLAIMER.PD within this package.
> + */
> +
> +#include
> +
> +extern wchar_t ** __MINGW_IMP_SYMBOL(_wcmdln);
> +
> +wchar_t **__cdecl __p__wcmdln(void);
> +wchar_t **__cdecl __p__wcmdln(void)
> +{
> +return __MINGW_IMP_SYMBOL(_wcmdln);
> +}
> +
> +typedef wchar_t **__cdecl (*_f__p__wcmdln)(void);
> +_f__p__wcmdln __MINGW_IMP_SYMBOL(__p__wcmdln) = __p__wcmdln;
> --
> 2.7.4
>
>
> --
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> ___
> Mingw-w64-public mailing list
> Mingw-w64-public@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
