commit a2acb1e84effd2794aa7515261806f286b86432f
author Bob Wilson <bob.wilson@apple.com> Fri Aug 08 23:46:28 2014 +0000
committer Bob Wilson <bob.wilson@apple.com> Fri Aug 08 23:46:28 2014 +0000
tree 7f895451d96055b5a81a3b2aed7603ce08b52e55
parent 7400e596a39ce5252056a9f63113c42b2c172d3c

Add predefined macros to identify x86_64h architectures.

Patch by Jim Grosbach.

llvm-svn: 215260

clang/lib/Basic/Targets.cpp

diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp
index 227fefe..2b8de8a 100644
--- a/clang/lib/Basic/Targets.cpp
+++ b/clang/lib/Basic/Targets.cpp
@@ -2668,6 +2668,10 @@
     Builder.defineMacro("__amd64");
     Builder.defineMacro("__x86_64");
     Builder.defineMacro("__x86_64__");
+    if (getTriple().getArchName() == "x86_64h") {
+      Builder.defineMacro("__x86_64h");
+      Builder.defineMacro("__x86_64h__");
+    }
   } else {
     DefineStd(Builder, "i386", Opts);
   }

clang/test/Preprocessor/init.c

diff --git a/clang/test/Preprocessor/init.c b/clang/test/Preprocessor/init.c
index edf6537..67ed838 100644
--- a/clang/test/Preprocessor/init.c
+++ b/clang/test/Preprocessor/init.c
@@ -6230,6 +6230,13 @@
 // X86_64:#define __x86_64 1
 // X86_64:#define __x86_64__ 1
 //
+// RUN: %clang_cc1 -E -dM -ffreestanding -triple=x86_64h-none-none < /dev/null | FileCheck -check-prefix X86_64H %s
+//
+// X86_64H:#define __x86_64 1
+// X86_64H:#define __x86_64__ 1
+// X86_64H:#define __x86_64h 1
+// X86_64H:#define __x86_64h__ 1
+
 // RUN: %clang_cc1 -E -dM -ffreestanding -triple=x86_64-none-none-gnux32 < /dev/null | FileCheck -check-prefix X32 %s
 //
 // X32:#define _ILP32 1