fix build for msvc/x86

Author: rainers

src/core/cpuid.d

@@ -845,7 +845,7 @@ bool hasCPUID()
         return true;
     else version(LDC) {
         size_t flags;
-        asm {
+        asm @nogc nothrow {
             pushf;
             pop EAX;
             mov flags, EAX;

src/ldc/eh/common.d

@@ -30,7 +30,7 @@ extern(C) void fatalerror(in char* format, ...)
 //    Reading DWARF data
 // ------------------------
 
-version (Win64) {} else
+version (CRuntime_Microsoft) {} else
 {
     extern(C)
     {
@@ -195,15 +195,15 @@ ubyte* get_encoded_value(ubyte* addr, ref size_t res, ubyte encoding, void* cont
             res += cast(size_t)old_addr;
             break;
         case _DW_EH_Format.DW_EH_PE_funcrel:
-            version(Win64) fatalerror("Not yet implemented."); else
+            version(CRuntime_Microsoft) fatalerror("Not yet implemented."); else
             res += cast(size_t)_Unwind_GetRegionStart(context);
             break;
         case _DW_EH_Format.DW_EH_PE_textrel:
-            version(Win64) fatalerror("Not yet implemented."); else
+            version(CRuntime_Microsoft) fatalerror("Not yet implemented."); else
             res += cast(size_t)_Unwind_GetTextRelBase(context);
             break;
         case _DW_EH_Format.DW_EH_PE_datarel:
-            version(Win64) fatalerror("Not yet implemented."); else
+            version(CRuntime_Microsoft) fatalerror("Not yet implemented."); else
             res += cast(size_t)_Unwind_GetDataRelBase(context);
             break;
         default:
@@ -231,7 +231,7 @@ ptrdiff_t get_base_of_encoded_value(ubyte encoding, void* context)
         case DW_EH_PE_aligned:
             return 0;
 
-      version(Win64) {} else
+      version(CRuntime_Microsoft) {} else
       {
         case DW_EH_PE_textrel:
             return _Unwind_GetTextRelBase (context);

src/rt/sections_ldc.d

@@ -96,7 +96,7 @@ private
             Section(SEG_DATA, SECT_COMMON)
         ];
     }
-    else version (Win64)
+    else version (CRuntime_Microsoft)
     {
         extern extern (C) __gshared
         {
@@ -371,7 +371,7 @@ void initSections()
         }
         _dyld_register_func_for_add_image(&scanSections);
     }
-    else version (Win64)
+    else version (CRuntime_Microsoft)
     {
         pushRange(_data_start__, _data_end__);
         if (_bss_start__ != null)

src/rt/stdio_msvc.c

@@ -36,9 +36,20 @@ int _set_output_format(int format); // VS2013-
 //extern const char* __acrt_iob_func;
 extern const char* _nullfunc = 0;
 
-#pragma comment(linker, "/alternatename:__acrt_iob_func=_nullfunc")
-#pragma comment(linker, "/alternatename:__iob_func=_nullfunc")
-#pragma comment(linker, "/alternatename:_set_output_format=_nullfunc")
+#if defined _M_IX86
+    #define C_PREFIX "_"
+#elif defined _M_X64 || defined _M_ARM || defined _M_ARM64
+    #define C_PREFIX ""
+#else
+    #error Unsupported architecture
+#endif
+
+#define DECLARE_ALTERNATE_NAME(name, alternate_name)  \
+    __pragma(comment(linker, "/alternatename:" C_PREFIX #name "=" C_PREFIX #alternate_name))
+
+DECLARE_ALTERNATE_NAME (__acrt_iob_func, _nullfunc);
+DECLARE_ALTERNATE_NAME (__iob_func, _nullfunc);
+DECLARE_ALTERNATE_NAME (_set_output_format, _nullfunc);
 
 void init_msvc()
 {
@@ -65,25 +76,25 @@ void init_msvc()
 // VS2015+ provides C99-conformant (v)snprintf functions, so weakly
 // link to legacy _(v)snprintf (not C99-conformant!) for VS2013- only
 
-#pragma comment(linker, "/alternatename:snprintf=_snprintf")
-#pragma comment(linker, "/alternatename:vsnprintf=_vsnprintf")
+DECLARE_ALTERNATE_NAME (snprintf, _snprintf);
+DECLARE_ALTERNATE_NAME (vsnprintf, _vsnprintf);
 
 // VS2013- implements these functions as macros, VS2015+ provides symbols
 
-#pragma comment(linker, "/alternatename:_fputc_nolock=_msvc_fputc_nolock")
-#pragma comment(linker, "/alternatename:_fgetc_nolock=_msvc_fgetc_nolock")
-#pragma comment(linker, "/alternatename:rewind=_msvc_rewind")
-#pragma comment(linker, "/alternatename:clearerr=_msvc_clearerr")
-#pragma comment(linker, "/alternatename:feof=_msvc_feof")
-#pragma comment(linker, "/alternatename:ferror=_msvc_ferror")
-#pragma comment(linker, "/alternatename:fileno=_msvc_fileno")
+DECLARE_ALTERNATE_NAME (_fputc_nolock, _msvc_fputc_nolock);
+DECLARE_ALTERNATE_NAME (_fgetc_nolock, _msvc_fgetc_nolock);
+DECLARE_ALTERNATE_NAME (rewind, _msvc_rewind);
+DECLARE_ALTERNATE_NAME (clearerr, _msvc_clearerr);
+DECLARE_ALTERNATE_NAME (feof, _msvc_feof);
+DECLARE_ALTERNATE_NAME (ferror, _msvc_ferror);
+DECLARE_ALTERNATE_NAME (fileno, _msvc_fileno);
 
 // VS2013- helper functions
 int _filbuf(FILE* fp);
 int _flsbuf(int c, FILE* fp);
 
-#pragma comment(linker, "/alternatename:_filbuf=_nullfunc")
-#pragma comment(linker, "/alternatename:_flsbuf=_nullfunc")
+DECLARE_ALTERNATE_NAME(_filbuf, _nullfunc);
+DECLARE_ALTERNATE_NAME(_flsbuf, _nullfunc);
 
 int _msvc_fputc_nolock(int c, FILE* fp)
 {