This is an archive of the discontinued LLVM Phabricator instance.

Differential D127650

[libc++] Remove macros for IBM compiler
ClosedPublic

Authored by ldionne on Jun 13 2022, 8:22 AM.

Details

Reviewers
Mordante
daltenty
SeanP
Group Reviewers
Restricted Project
Commits
rGee78181f34ca: [libc++] Remove macros for IBM compiler
Summary

It's not tested or used anymore -- instead a Clang-based compiler is
used on IBM nowadays.

Diff Detail

Event Timeline

ldionne created this revision.Jun 13 2022, 8:22 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 13 2022, 8:22 AM
ldionne requested review of this revision.Jun 13 2022, 8:22 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 13 2022, 8:22 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B169457: Diff 436403.Jun 13 2022, 9:23 AM
Mordante accepted this revision as: Mordante.Jun 13 2022, 9:29 AM
Mordante added a subscriber: Mordante.

Nice cleanup LGTM! I think it would be good to add some of the IBM people as reviewer too.

libcxx/include/__config
516

Can _LIBCPP_HAS_NO_UNICODE_CHARS be set in CMake by users? If not this seems to be the only place where _LIBCPP_HAS_NO_UNICODE_CHARS is defined.

In that case do you want to make a followup patch to remove this, or do you want me to do it?

ldionne marked an inline comment as done.Jun 13 2022, 3:04 PM
ldionne added subscribers: SeanP, hubert.reinterpretcast, daltenty.
In D127650#3578528, @Mordante wrote:

Nice cleanup LGTM! I think it would be good to add some of the IBM people as reviewer too.

We discussed this with @SeanP, but adding others as well.

libcxx/include/__config
516

Oh, wow, that's freakin' great. I've been meaning to clean this up for a very long time, but I didn't know how to. I'll actually fold the removal into this patch since it's directly tied to _LIBCPP_COMPILER_IBM.

hubert.reinterpretcast added a comment.Jun 13 2022, 3:13 PM
In D127650#3579911, @ldionne wrote:

We discussed this with @SeanP, but adding others as well.

I am on board for this.

ldionne updated this revision to Diff 436585.Jun 13 2022, 3:18 PM
ldionne marked an inline comment as done.

Remove _LIBCPP_HAS_NO_UNICODE_CHARS

daltenty accepted this revision.Jun 13 2022, 4:50 PM

LGTM, as noted the the configuration for the IBM XL compiler is unused, modern Open XL goes down the clang paths.

SeanP accepted this revision.Jun 13 2022, 4:52 PM

These look good to me. I do see the the AIX CI build is broken. This is due to -X32_64 being passed to llvm-ar. That appears independent of this change. @daltenty will need to take a look at that.

Harbormaster completed remote builds in B169581: Diff 436585.Jun 13 2022, 7:25 PM
ldionne accepted this revision as: Restricted Project.Jun 14 2022, 6:13 AM

Thanks for double-checking folks!

This revision is now accepted and ready to land.Jun 14 2022, 6:13 AM
This revision was landed with ongoing or failed builds.Jun 14 2022, 6:15 AM
Closed by commit rGee78181f34ca: [libc++] Remove macros for IBM compiler (authored by ldionne). · Explain Why
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rGee78181f34ca: [libc++] Remove macros for IBM compiler.
Mordante added a comment.Jun 14 2022, 12:21 PM
In D127650#3579921, @ldionne wrote:

Remove _LIBCPP_HAS_NO_UNICODE_CHARS

Great, thanks a lot!

daltenty mentioned this in D129491: [libcxx][AIX][z/OS] Remove headers included via `_IBMCPP__`.Jul 11 2022, 8:19 AM
daltenty mentioned this in rGa83004f4ff9e: [libcxx][AIX][z/OS] Remove headers included via `_IBMCPP__`.Jul 14 2022, 12:42 PM

Revision Contents

PathSize
libcxx/
include/
25 lines

Diff 436403

libcxx/include/__config

Show First 20 Lines • Show All 195 Lines • ▼ Show 20 Lines
# define _LIBCPP_APPLE_CLANG_VER (__apple_build_version__ / 10000) # define _LIBCPP_APPLE_CLANG_VER (__apple_build_version__ / 10000)
#elif defined(__clang__) #elif defined(__clang__)
# define _LIBCPP_COMPILER_CLANG_BASED # define _LIBCPP_COMPILER_CLANG_BASED
# define _LIBCPP_CLANG_VER (__clang_major__ * 100 + __clang_minor__) # define _LIBCPP_CLANG_VER (__clang_major__ * 100 + __clang_minor__)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define _LIBCPP_COMPILER_GCC # define _LIBCPP_COMPILER_GCC
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
# define _LIBCPP_COMPILER_MSVC # define _LIBCPP_COMPILER_MSVC
#elif defined(__IBMCPP__)
# define _LIBCPP_COMPILER_IBM
#endif #endif
#if defined(_LIBCPP_COMPILER_GCC) && __cplusplus < 201103L #if defined(_LIBCPP_COMPILER_GCC) && __cplusplus < 201103L
#error "libc++ does not support using GCC with C++03. Please enable C++11" #error "libc++ does not support using GCC with C++03. Please enable C++11"
#endif #endif
// FIXME: ABI detection should be done via compiler builtin macros. This // FIXME: ABI detection should be done via compiler builtin macros. This
// is just a placeholder until Clang implements such macros. For now assume // is just a placeholder until Clang implements such macros. For now assume
▲ Show 20 Lines • Show All 287 Lines • ▼ Show 20 Lines
#define _LIBCPP_HAS_NO_ASAN #define _LIBCPP_HAS_NO_ASAN
#define _LIBCPP_ALWAYS_INLINE __forceinline #define _LIBCPP_ALWAYS_INLINE __forceinline
#define _LIBCPP_HAS_NO_VECTOR_EXTENSION #define _LIBCPP_HAS_NO_VECTOR_EXTENSION
#define _LIBCPP_DISABLE_EXTENSION_WARNING #define _LIBCPP_DISABLE_EXTENSION_WARNING
#elif defined(_LIBCPP_COMPILER_IBM) #endif // _LIBCPP_COMPILER_[CLANG|GCC|MSVC]
#define _ALIGNAS(x) __attribute__((__aligned__(x)))
#define _ALIGNAS_TYPE(x) __attribute__((__aligned__(_LIBCPP_ALIGNOF(x))))
#define _ATTRIBUTE(x) __attribute__((x))
#define _LIBCPP_NORETURN __attribute__((noreturn))
#define _LIBCPP_HAS_NO_UNICODE_CHARS
MordanteUnsubmitted
Done
ReplyInline Actions

Can _LIBCPP_HAS_NO_UNICODE_CHARS be set in CMake by users? If not this seems to be the only place where _LIBCPP_HAS_NO_UNICODE_CHARS is defined.

In that case do you want to make a followup patch to remove this, or do you want me to do it?

Mordante: Can `_LIBCPP_HAS_NO_UNICODE_CHARS` be set in CMake by users? If not this seems to be the only…
ldionneAuthorUnsubmitted
Done
ReplyInline Actions

Oh, wow, that's freakin' great. I've been meaning to clean this up for a very long time, but I didn't know how to. I'll actually fold the removal into this patch since it's directly tied to _LIBCPP_COMPILER_IBM.

ldionne: Oh, wow, that's freakin' great. I've been meaning to clean this up for a very long time, but I…
#if defined(_AIX)
#define __MULTILOCALE_API
#endif
#define _LIBCPP_HAS_NO_ASAN
#define _LIBCPP_ALWAYS_INLINE __attribute__ ((__always_inline__))
#define _LIBCPP_HAS_NO_VECTOR_EXTENSION
#define _LIBCPP_DISABLE_EXTENSION_WARNING
#endif // _LIBCPP_COMPILER_[CLANG|GCC|MSVC|IBM]
#if defined(_LIBCPP_OBJECT_FORMAT_COFF) #if defined(_LIBCPP_OBJECT_FORMAT_COFF)
#ifdef _DLL #ifdef _DLL
# define _LIBCPP_CRT_FUNC __declspec(dllimport) # define _LIBCPP_CRT_FUNC __declspec(dllimport)
#else #else
# define _LIBCPP_CRT_FUNC # define _LIBCPP_CRT_FUNC
#endif #endif
▲ Show 20 Lines • Show All 752 Lines • Show Last 20 Lines