diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2009-04-17 11:06:20 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2009-04-17 11:06:20 +0200 |
| commit | ba4a2f78eeb327397844448956bcc7abd5729050 (patch) | |
| tree | 756c6f16bfba7fb26f0b99204170088a8412a739 /gcc/ada/initialize.c | |
| parent | 78246a6e7541ef1c2008e68e54c941d694926fcd (diff) | |
| download | gcc-ba4a2f78eeb327397844448956bcc7abd5729050.zip gcc-ba4a2f78eeb327397844448956bcc7abd5729050.tar.gz gcc-ba4a2f78eeb327397844448956bcc7abd5729050.tar.bz2 | |
[multiple changes]
2009-04-17 Pascal Obry <obry@adacore.com>
* initialize.c: Set gnat_argv with UTF-8 encoded strings on Windows.
* adaint.h, argv.c, bindgen.adb: Reverted to previous version.
2009-04-17 Robert Dewar <dewar@adacore.com>
* a-except.adb, a-except-2005.adb: Add PE_Address_Of_Intrinsic
* sem_attr.adb (Analyze_Attribute, case Address): Use
PE_Address_Of_Intrinsic.
* types.ads: Add PE_Address_Of_Intrinsic
* types.h: Add PE_Address_Of_Intrinsic
From-SVN: r146226
Diffstat (limited to 'gcc/ada/initialize.c')
| -rw-r--r-- | gcc/ada/initialize.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/gcc/ada/initialize.c b/gcc/ada/initialize.c index dbaf80f..5e7b2ff 100644 --- a/gcc/ada/initialize.c +++ b/gcc/ada/initialize.c @@ -43,6 +43,8 @@ #ifdef IN_RTS #include "tconfig.h" #include "tsystem.h" +/* We don't have libiberty, so use malloc. */ +#define xmalloc(S) malloc (S) #else #include "config.h" #include "system.h" @@ -55,11 +57,15 @@ /******************************************/ #if defined (__MINGW32__) +#include "mingw32.h" #include <windows.h> extern void __gnat_init_float (void); extern void __gnat_install_SEH_handler (void *); +extern int gnat_argc; +extern char **gnat_argv; + #ifndef RTX /* Do not define for RTX since it is only used for creating child processes which is not supported in RTX. */ @@ -75,6 +81,32 @@ __gnat_initialize (void *eh) given that we have set Max_Digits etc with this in mind */ __gnat_init_float (); + /* Adjust gnat_argv to support Unicode characters. */ + { + char arg_utf8[MAX_PATH]; + LPWSTR *wargv; + int wargc; + int k; + + wargv = CommandLineToArgvW (GetCommandLineW(), &wargc); + + if (wargv != NULL) + { + /* Set gnat_argv with arguments encoded in UTF-8. */ + gnat_argv = (char **) xmalloc ((wargc + 1) * sizeof (char *)); + + for (k=0; k<wargc; k++) + { + WS2SU (arg_utf8, wargv[k], MAX_PATH); + gnat_argv[k] = (char *) xmalloc (strlen (arg_utf8) + 1); + strcpy (gnat_argv[k], arg_utf8); + } + + LocalFree (wargv); + gnat_argc = wargc; + } + } + /* Note that we do not activate this for the compiler itself to avoid a bootstrap path problem. Older version of gnatbind will generate a call to __gnat_initialize() without argument. Therefore we cannot use eh in |