maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[Targets] Define _M_AMD64 and _M_X64 to a more appropriate value 

We used to define them to 1, we should have defined them to 100.

llvm-svn: 243255
This commit is contained in:
David Majnemer 2015-07-26 23:17:29 +00:00
parent 2764794ba4
commit b856e8f071
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Basic/Targets.cpp
View File

@ -4000,8 +4000,8 @@ public:
MacroBuilder &Builder) const override { MacroBuilder &Builder) const override {
WindowsX86_64TargetInfo::getTargetDefines(Opts, Builder); WindowsX86_64TargetInfo::getTargetDefines(Opts, Builder);
WindowsX86_64TargetInfo::getVisualStudioDefines(Opts, Builder); WindowsX86_64TargetInfo::getVisualStudioDefines(Opts, Builder);
Builder.defineMacro("_M_X64"); Builder.defineMacro("_M_X64", "100");
Builder.defineMacro("_M_AMD64"); Builder.defineMacro("_M_AMD64", "100");
} }
}; };

4
clang/test/Preprocessor/predefined-macros.c
View File

@ -18,8 +18,8 @@
// CHECK-MS64: #define _INTEGRAL_MAX_BITS 64 // CHECK-MS64: #define _INTEGRAL_MAX_BITS 64
// CHECK-MS64: #define _MSC_EXTENSIONS 1 // CHECK-MS64: #define _MSC_EXTENSIONS 1
// CHECK-MS64: #define _MSC_VER 1300 // CHECK-MS64: #define _MSC_VER 1300
// CHECK-MS64: #define _M_AMD64 1 // CHECK-MS64: #define _M_AMD64 100
// CHECK-MS64: #define _M_X64 1 // CHECK-MS64: #define _M_X64 100
// CHECK-MS64: #define _WIN64 1 // CHECK-MS64: #define _WIN64 1
// CHECK-MS64-NOT: #define __STRICT_ANSI__ // CHECK-MS64-NOT: #define __STRICT_ANSI__
// CHECK-MS64-NOT: GCC // CHECK-MS64-NOT: GCC