From 7996340d9ff4d3ffaed24fbc74d585852a0f1476 Mon Sep 17 00:00:00 2001 From: Yaron Keren Date: Thu, 21 Jul 2016 07:44:41 +0000 Subject: [PATCH] Provide __GLIBCXX_TYPE_INT_N_0 and __GLIBCXX_BITSIZE_INT_N_0 when in C++ gnu language extensions. These are used by libstdc++ for is_integral<__int128>. Addresses http://llvm.org/pr23156. llvm-svn: 276252 --- clang/lib/Frontend/InitPreprocessor.cpp | 5 +++++ clang/test/Frontend/int128.cpp | 11 +++++++++++ 2 files changed, 16 insertions(+) create mode 100644 clang/test/Frontend/int128.cpp diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp index cc4a0bf..f8b912e 100644 --- a/clang/lib/Frontend/InitPreprocessor.cpp +++ b/clang/lib/Frontend/InitPreprocessor.cpp @@ -961,6 +961,11 @@ static void InitializePredefinedMacros(const TargetInfo &TI, #include "clang/Basic/OpenCLExtensions.def" } + if (TI.hasInt128Type() && LangOpts.CPlusPlus && LangOpts.GNUMode) { + Builder.defineMacro("__GLIBCXX_TYPE_INT_N_0", "__int128"); + Builder.defineMacro("__GLIBCXX_BITSIZE_INT_N_0", "128"); + } + // Get other target #defines. TI.getTargetDefines(LangOpts, Builder); } diff --git a/clang/test/Frontend/int128.cpp b/clang/test/Frontend/int128.cpp new file mode 100644 index 0000000..145144a --- /dev/null +++ b/clang/test/Frontend/int128.cpp @@ -0,0 +1,11 @@ +// RUN: %clang_cc1 -x c -std=gnu99 -dM -E -triple x86_64-pc-linux %s | FileCheck -check-prefix=NO %s +// RUN: %clang_cc1 -x c++ -std=c++11 -dM -E -triple x86_64-pc-linux %s | FileCheck -check-prefix=NO %s +// RUN: %clang_cc1 -x c++ -std=gnu++11 -dM -E -triple i686-pc-linux %s | FileCheck -check-prefix=NO %s +// RUN: %clang_cc1 -x c++ -std=gnu++11 -dM -E -triple x86_64-pc-linux %s | FileCheck -check-prefix=YES %s +// RUN: %clang_cc1 -x c++ -std=gnu++1y -dM -E -triple x86_64-pc-linux %s | FileCheck -check-prefix=YES %s +// PR23156 + +// NO-NOT: __GLIBCXX_TYPE_INT_N_0 +// NO-NOT: __GLIBCXX_BITSIZE_INT_N_0 +// YES-DAG: __GLIBCXX_TYPE_INT_N_0 +// YES-DAG: __GLIBCXX_BITSIZE_INT_N_0 -- 2.7.4