mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-23 17:05:26 +02:00
Code Issues Wiki Activity

MSVC: Add a few more macro workarounds for missing built-ins

Browse source 
This change adds a few more macro to define things that are supposed to
be built-in in MSVC. Eventually we might want to move some of those to
the parser but it's not clear to me if we want to polute the GCC parser
with all of this.

Change-Id: I6672d8f14470115aa37a0d76b2b4fb086fe4494f
Signed-off-by: Marc-Andre Laperle <malaperle@gmail.com>
This commit is contained in:
Marc-Andre Laperle 2019-07-02 23:44:59 -04:00 • committed by Marc-André Laperle
parent dee22911a5
commit b1702ff753
2 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinDiscoveredPathInfo.java
View file

@ -31,26 +31,33 @@ public class WinDiscoveredPathInfo implements IDiscoveredPathInfo {
// Include paths
paths = WinEnvironmentVariableSupplier.getIncludePath();
symbols.put("_M_IX86", "600");
symbols.put("_WIN32", "1");
symbols.put("_MSC_VER", "1400");
symbols.put("_M_IX86", "600"); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("_WIN32", "1"); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("_MSC_VER", "1400"); //$NON-NLS-1$ //$NON-NLS-2$
// Microsoft specific modifiers that can be ignored
symbols.put("__cdecl", "");
symbols.put("__fastcall", "");
symbols.put("__restrict", "");
symbols.put("__sptr", "");
symbols.put("__stdcall", "");
symbols.put("__unaligned", "");
symbols.put("__uptr", "");
symbols.put("__w64", "");
symbols.put("__cdecl", ""); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__fastcall", ""); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__restrict", ""); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__sptr", ""); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__stdcall", ""); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__unaligned", ""); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__uptr", ""); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__w64", ""); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__clrcall", ""); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__thiscall", ""); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__vectorcall", ""); //$NON-NLS-1$ //$NON-NLS-2$
// Redefine some things so that the CDT parser can handle them, until there is a VC specific parser
symbols.put("__forceinline", "__inline");
symbols.put("__int8", "char");
symbols.put("__int16", "short");
symbols.put("__int32", "int");
symbols.put("__int64", "long long");
symbols.put("__forceinline", "__inline"); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__int8", "char"); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__int16", "short"); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__int32", "int"); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__int64", "long long"); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__pragma(X)", ""); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__nullptr", "nullptr"); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__debugbreak()", "0/0"); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__LPREFIX(A)", "L\"##A\""); //$NON-NLS-1$ //$NON-NLS-2$
}
@Override

7
windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/core/MSVCToolChain.java
View file

@ -123,6 +123,9 @@ public class MSVCToolChain extends PlatformObject implements IToolChain {
symbols.put("__unaligned", ""); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__uptr", ""); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__w64", ""); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__clrcall", ""); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__thiscall", ""); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__vectorcall", ""); //$NON-NLS-1$ //$NON-NLS-2$
// Redefine some things so that the CDT parser can handle them, until there is a VC specific parser
symbols.put("__forceinline", "__inline"); //$NON-NLS-1$ //$NON-NLS-2$
@ -130,6 +133,10 @@ public class MSVCToolChain extends PlatformObject implements IToolChain {
symbols.put("__int16", "short"); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__int32", "int"); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__int64", "long long"); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__pragma(X)", ""); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__nullptr", "nullptr"); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__debugbreak()", "0/0"); //$NON-NLS-1$ //$NON-NLS-2$
symbols.put("__LPREFIX(A)", "L\"##A\""); //$NON-NLS-1$ //$NON-NLS-2$
}
@Override