[OpenMP][bugfix] Add missing macros for Power

[gtbercea]

Summary

Add missing macros when the auxiliary triple points to the PPC architecture.

[Hahnfeld]

Please also update the test.

lib/Frontend/InitPreprocessor.cpp

1115–1133

I'd suggest to merge these two:

case llvm::Triple::ppc64:
case llvm::Triple::ppc64le:
  Builder.defineMacro("__powerpc64__");

  StringRef ABI = AuxTI.getABI();
  // Set _CALL_ELF macro needed for gnu/stubs.h
  if (ABI == "elfv1" || ABI == "elfv1-qpx")
    Builder.defineMacro("_CALL_ELF", "1");
  if (ABI == "elfv2")
    Builder.defineMacro("_CALL_ELF", "2");

  // TODO: Add comment where this is needed and for what reason.
  if (AuxTI.getLongDoubleWidth() == 128) {
    Builder.defineMacro("__LONG_DOUBLE_128__");
    Builder.defineMacro("__LONGDOUBLE128");
  }
  break;

[kkwli0]

Need to update the test too?

[gtbercea]

Add test.

[Hahnfeld]

Not needed anymore after the reverts in rC341115 and rC341118, right? Maybe we should revive the test to make sure we don't break this in the future?

lib/Frontend/InitPreprocessor.cpp

static void InitializePredefinedAuxMacros(const TargetInfo &AuxTI,
 
   // Define basic target macros needed by at least bits/wordsize.h and
   // bits/mathinline.h.
   // On PowerPC, explicitely set _CALL_ELF macro needed for gnu/stubs.h.
   switch (AuxTriple.getArch()) {
   case llvm::Triple::x86_64:
     Builder.defineMacro("__x86_64__");
     break;
   case llvm::Triple::ppc64:
-    Builder.defineMacro("__powerpc64__");
-    Builder.defineMacro("_CALL_ELF", "1");
-    break;
   case llvm::Triple::ppc64le:
+  {
     Builder.defineMacro("__powerpc64__");
+
+    StringRef ABI = AuxTI.getABI();
+    // Set _CALL_ELF macro needed for gnu/stubs.h
+    if (ABI == "elfv1" || ABI == "elfv1-qpx")
+      Builder.defineMacro("_CALL_ELF", "1");
+    if (ABI == "elfv2")
       Builder.defineMacro("_CALL_ELF", "2");
+
+    // Required by PowerPC host toolchain.
+    if (AuxTI.getLongDoubleWidth() == 128) {
+      Builder.defineMacro("__LONGDOUBLE128");
+      Builder.defineMacro("__LONG_DOUBLE_128__");
+    }
     break;
+  }
   default:
     break;
   }
 
   // libc++ needs to find out the object file format and threading API.
   if (AuxTriple.getOS() == llvm::Triple::Linux) {
     Builder.defineMacro("__ELF__");
     Builder.defineMacro("__linux__");

test/Preprocessor/aux-triple.c

 // NONE-NOT:#define _GNU_SOURCE
 // LINUX-CPP:#define _GNU_SOURCE 1
 
 // NVPTX64:#define _LP64 1
 
 // NONE-NOT:#define __ELF__
 // LINUX:#define __ELF__ 1
 
+// PPC64LE:#define __LONGDOUBLE128 1
+// PPC64LE:#define __LONG_DOUBLE_128__ 1
+
 // NVPTX64:#define __LP64__ 1
 // NVPTX64:#define __NVPTX__ 1
 // NVPTX64:#define __PTX__ 1
 
 // NONE-NOT:#define __linux__
 // LINUX:#define __linux__ 1
 
 // NONE-NOT:#define __powerpc64__
 // PPC64LE:#define __powerpc64__ 1
 
 // NONE-NOT:#define __x86_64__
 // X86_64:#define __x86_64__ 1