diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2015-07-26 23:17:29 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2015-07-26 23:17:29 +0000 |
| commit | b856e8f0719780c183ced21a29b00cb2759536a3 (patch) | |
| tree | e6bb06466875f92d42134c7305e9e2a5c7ed5c6e | |
| parent | 2764794ba48674cc658423e841fdf4959fa1acd9 (diff) | |
| download | bcm5719-llvm-b856e8f0719780c183ced21a29b00cb2759536a3.tar.gz bcm5719-llvm-b856e8f0719780c183ced21a29b00cb2759536a3.zip | |
[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
| -rw-r--r-- | clang/lib/Basic/Targets.cpp | 4 | ||||
| -rw-r--r-- | clang/test/Preprocessor/predefined-macros.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index 2d71517019d..8ecaeaf1d1c 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -4000,8 +4000,8 @@ public: MacroBuilder &Builder) const override { WindowsX86_64TargetInfo::getTargetDefines(Opts, Builder); WindowsX86_64TargetInfo::getVisualStudioDefines(Opts, Builder); - Builder.defineMacro("_M_X64"); - Builder.defineMacro("_M_AMD64"); + Builder.defineMacro("_M_X64", "100"); + Builder.defineMacro("_M_AMD64", "100"); } }; diff --git a/clang/test/Preprocessor/predefined-macros.c b/clang/test/Preprocessor/predefined-macros.c index a32f4a158c9..4130f7aefb5 100644 --- a/clang/test/Preprocessor/predefined-macros.c +++ b/clang/test/Preprocessor/predefined-macros.c @@ -18,8 +18,8 @@ // CHECK-MS64: #define _INTEGRAL_MAX_BITS 64 // CHECK-MS64: #define _MSC_EXTENSIONS 1 // CHECK-MS64: #define _MSC_VER 1300 -// CHECK-MS64: #define _M_AMD64 1 -// CHECK-MS64: #define _M_X64 1 +// CHECK-MS64: #define _M_AMD64 100 +// CHECK-MS64: #define _M_X64 100 // CHECK-MS64: #define _WIN64 1 // CHECK-MS64-NOT: #define __STRICT_ANSI__ // CHECK-MS64-NOT: GCC |
