diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2014-09-18 02:13:33 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2014-09-18 02:13:33 +0000 |
| commit | b404cb8e3945aad152d5769a9a6962387fd7544c (patch) | |
| tree | 5d595e0f0c68d84b4792ea67c6b298b86901ab09 | |
| parent | acb35c02724e97e85af4d13d620d4df132509b8a (diff) | |
| download | bcm5719-llvm-b404cb8e3945aad152d5769a9a6962387fd7544c.tar.gz bcm5719-llvm-b404cb8e3945aad152d5769a9a6962387fd7544c.zip | |
Basic: use hex string for __ARM_FP macro
The ARM ACLE describes the values as hex constants rather than numeric
constants; follow suit. Address post-commit review comments from Jon Roelofs.
llvm-svn: 218009
| -rw-r--r-- | clang/lib/Basic/Targets.cpp | 3 | ||||
| -rw-r--r-- | clang/test/Preprocessor/arm-acle-6.5.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index d7832e30372..511817f324c 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -21,6 +21,7 @@ #include "clang/Basic/TargetOptions.h" #include "llvm/ADT/APFloat.h" #include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringSwitch.h" #include "llvm/ADT/Triple.h" @@ -4055,7 +4056,7 @@ public: // ACLE 6.5.1 Hardware Floating Point if (HW_FP) - Builder.defineMacro("__ARM_FP", std::to_string(HW_FP)); + Builder.defineMacro("__ARM_FP", "0x" + llvm::utohexstr(HW_FP)); // ACLE predefines. Builder.defineMacro("__ARM_ACLE", "200"); diff --git a/clang/test/Preprocessor/arm-acle-6.5.c b/clang/test/Preprocessor/arm-acle-6.5.c index 8ee56f83453..9db83b774b0 100644 --- a/clang/test/Preprocessor/arm-acle-6.5.c +++ b/clang/test/Preprocessor/arm-acle-6.5.c @@ -9,7 +9,7 @@ // RUN: %clang -target arm-eabi -mfpu=vfp3 -x c -E -dM %s -o - | FileCheck %s -check-prefix CHECK-SP-DP // RUN: %clang -target armv7-eabi -x c -E -dM %s -o - | FileCheck %s -check-prefix CHECK-SP-DP -// CHECK-SP-DP: __ARM_FP 12 +// CHECK-SP-DP: __ARM_FP 0xC // RUN: %clang -target arm-eabi -mfpu=vfpv4 -x c -E -dM %s -o - | FileCheck %s -check-prefix CHECK-SP-DP-HP // RUN: %clang -target arm-eabi -mfpu=vfpv4-d16 -x c -E -dM %s -o - | FileCheck %s -check-prefix CHECK-SP-DP-HP @@ -18,5 +18,5 @@ // RUN: %clang -target arm-eabi -mfpu=crypto-neon-fp-armv8 -x c -E -dM %s -o - | FileCheck %s -check-prefix CHECK-SP-DP-HP // RUN: %clang -target armv8-eabi -x c -E -dM %s -o - | FileCheck %s -check-prefix CHECK-SP-DP-HP -// CHECK-SP-DP-HP: __ARM_FP 14 +// CHECK-SP-DP-HP: __ARM_FP 0xE |
