[AIX] Define __TOS_AIX__ predefined macro

[Jake-Egan]

Summary

Transfer the predefined macro, __TOS_AIX__, from the AIX XL C/C++ compilers.

__TOS_AIX__ indicates that the target operating system is AIX.

[cebowleratibm]

Please rework the test update into init-ppc.c

clang/lib/Basic/Targets/PPC.cpp

95 ↗

(On Diff #349445)

The XL compilers define this macro for Power but GCC does not. The macro is redundant and I recommend we not carry it forward to Linux. There's probably a case to define it on AIX where the prevalent XL compilers have always defined it.

clang/test/Preprocessor/init-aix.c

1 ↗

(On Diff #349445)

There are some AIX macro tests already in init-ppc.c. Note the target triple should be specified or this test will break when run on a non AIX host.

[Jake-Egan]

Removed

__THW_PPC__

and moved tests to init-ppc.c

[Jake-Egan]

Fix diff

[cebowleratibm]

clang/lib/Basic/Targets/OSTargets.h

680

Should set these macros in C11 and higher levels.

clang/test/Preprocessor/init-ppc.c

544

I think it's sufficient to test the STDC_NO_ATOMICS and STDC_NO_THREADS only as you've added below where the -std is explicitly controlled. I prefer to avoid expecting these macros for the -std default, which may change.

751

suggest adding the negative test for pre C11 modes.

[Jake-Egan]

Set macros for C11 and higher. Add negative test for pre C11.

[cebowleratibm]

clang/lib/Basic/Targets/OSTargets.h

680

I think LangStandard::isC11() does what you want. You wouldn't want to update this code every time a new C standard comes out.

clang/test/Preprocessor/init-ppc.c

766

I didn't mean to suggest adding all of them. One negative test on c99 would suffice.

[Jake-Egan]

This comment was removed by Jake-Egan.

[Jake-Egan]

Use LangStandard::isC11() and one C99 test.

[cebowleratibm]

I think it makes sense to split the STDC macro changes and TOS_AIX__ into different patches.

[Jake-Egan]

Use this patch to target only __TOS_AIX__.

[cebowleratibm]

LGTM

clang/lib/Basic/Targets/OSTargets.h

 protected:
   void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
                     MacroBuilder &Builder) const override {
     DefineStd(Builder, "unix", Opts);
     Builder.defineMacro("_IBMR2");
     Builder.defineMacro("_POWER");
 
     Builder.defineMacro("_AIX");
+    Builder.defineMacro("__TOS_AIX__");
 
     if (Opts.C11) {
       Builder.defineMacro("__STDC_NO_ATOMICS__");
       Builder.defineMacro("__STDC_NO_THREADS__");
     }
 
     if (Opts.EnableAIXExtendedAltivecABI)
       Builder.defineMacro("__EXTABI__");
 
     unsigned Major, Minor, Micro;

clang/test/Preprocessor/init-ppc.c

 // PPC-AIX:#define __SIZEOF_PTRDIFF_T__ 4
 // PPC-AIX:#define __SIZEOF_SHORT__ 2
 // PPC-AIX:#define __SIZEOF_SIZE_T__ 4
 // PPC-AIX:#define __SIZEOF_WCHAR_T__ 2
 // PPC-AIX:#define __SIZEOF_WINT_T__ 4
 // PPC-AIX:#define __SIZE_MAX__ 4294967295UL
 // PPC-AIX:#define __SIZE_TYPE__ long unsigned int
 // PPC-AIX:#define __SIZE_WIDTH__ 32
+// PPC-AIX:#define __TOS_AIX__ 1
 // PPC-AIX:#define __UINT16_C_SUFFIX__
 // PPC-AIX:#define __UINT16_MAX__ 65535
 // PPC-AIX:#define __UINT16_TYPE__ unsigned short
 // PPC-AIX:#define __UINT32_C_SUFFIX__ U
 // PPC-AIX:#define __UINT32_MAX__ 4294967295U
 // PPC-AIX:#define __UINT32_TYPE__ unsigned int
 // PPC-AIX:#define __UINT64_C_SUFFIX__ ULL
 // PPC-AIX:#define __UINT64_MAX__ 18446744073709551615ULL

 // PPC-AIX-NOWCHAR-NOT:#define _WCHAR_T 1
 
 // RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc-ibm-aix7.1.0.0 -fno-signed-char -pthread < /dev/null | FileCheck -match-full-lines -check-prefix PPC-AIX-THREADSAFE %s
 // PPC-AIX-THREADSAFE:#define _THREAD_SAFE 1
 
 // RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc-ibm-aix7.1.0.0 -fno-signed-char < /dev/null | FileCheck -match-full-lines -check-prefix PPC-AIX-NOTHREADSAFE %s
 // PPC-AIX-NOTHREADSAFE-NOT:#define _THREAD_SAFE 1
 
 // RUN: %clang_cc1 -x c -std=c11 -E -dM -ffreestanding -triple=powerpc-ibm-aix7.1.0.0 -fno-signed-char < /dev/null | FileCheck -match-full-lines -check-prefix PPC-AIX-STDC %s
 // RUN: %clang_cc1 -x c -std=gnu11 -E -dM -ffreestanding -triple=powerpc-ibm-aix7.1.0.0 -fno-signed-char < /dev/null | FileCheck -match-full-lines -check-prefix PPC-AIX-STDC %s
 // RUN: %clang_cc1 -x c -std=c17 -E -dM -ffreestanding -triple=powerpc-ibm-aix7.1.0.0 -fno-signed-char < /dev/null | FileCheck -match-full-lines -check-prefix PPC-AIX-STDC %s
 // PPC-AIX-STDC:#define __STDC_NO_ATOMICS__ 1
 // PPC-AIX-STDC:#define __STDC_NO_THREADS__ 1
 
 // RUN: %clang_cc1 -x c -std=c99 -E -dM -ffreestanding -triple=powerpc-ibm-aix7.1.0.0 -fno-signed-char < /dev/null | FileCheck -match-full-lines -check-prefix PPC-AIX-STDC-N %s
 // PPC-AIX-STDC-N-NOT:#define __STDC_NO_ATOMICS__ 1
 // PPC-AIX-STDC-N-NOT:#define __STDC_NO_THREADS__ 1
 
 // RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc-unknown-linux-gnu -fno-signed-char < /dev/null | FileCheck -match-full-lines -check-prefix PPC-LINUX %s
 //
 // PPC-LINUX:#define _ARCH_PPC 1
 // PPC-LINUX:#define _BIG_ENDIAN 1
 // PPC-LINUX-NOT:#define _LP64
 // PPC-LINUX:#define __BIGGEST_ALIGNMENT__ 16
 // PPC-LINUX:#define __BIG_ENDIAN__ 1
 // PPC-LINUX:#define __BYTE_ORDER__ __ORDER_BIG_ENDIAN__
 // PPC-LINUX:#define __CHAR16_TYPE__ unsigned short
 // PPC-LINUX:#define __CHAR32_TYPE__ unsigned int
 // PPC-LINUX:#define __CHAR_BIT__ 8
 // PPC-LINUX:#define __CHAR_UNSIGNED__ 1
 // PPC-LINUX:#define __DBL_DENORM_MIN__ 4.9406564584124654e-324
 // PPC-LINUX:#define __DBL_DIG__ 15