This is an archive of the discontinued LLVM Phabricator instance.

Differential D129491

[libcxx][AIX][z/OS] Remove headers included via `_IBMCPP__`
ClosedPublic

Authored by daltenty on Jul 11 2022, 8:19 AM.

Details

Reviewers
hubert.reinterpretcast
fanbo-meng
ldionne
Group Reviewers
Restricted Project
Commits
rGa83004f4ff9e: [libcxx][AIX][z/OS] Remove headers included via `_IBMCPP__`
Summary

D127650 removed support for non-clang-based XL compilers, but left some of the headers used only by this compiler and included under the __IBMCPP__ macro. This change cleans this up by deleting these headers

Diff Detail

Event Timeline

daltenty created this revision.Jul 11 2022, 8:19 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 11 2022, 8:19 AM
Herald added subscribers: krytarowski, mgorny. · View Herald Transcript
daltenty requested review of this revision.Jul 11 2022, 8:19 AM
fanbo-meng accepted this revision.Jul 11 2022, 8:33 AM

LGTM

This revision is now accepted and ready to land.Jul 11 2022, 8:33 AM
Harbormaster completed remote builds in B174677: Diff 443650.Jul 11 2022, 8:38 AM
hubert.reinterpretcast added a project: Restricted Project.Jul 11 2022, 5:41 PM
hubert.reinterpretcast added a subscriber: libcxx-commits.
hubert.reinterpretcast added a comment.Jul 11 2022, 5:44 PM

LGTM from the AIX side; thanks!

hubert.reinterpretcast accepted this revision.Jul 11 2022, 5:44 PM
This revision was landed with ongoing or failed builds.Jul 14 2022, 12:42 PM
Closed by commit rGa83004f4ff9e: [libcxx][AIX][z/OS] Remove headers included via `_IBMCPP__` (authored by daltenty). · Explain Why
This revision was automatically updated to reflect the committed changes.
daltenty added a commit: rGa83004f4ff9e: [libcxx][AIX][z/OS] Remove headers included via `_IBMCPP__`.
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 14 2022, 12:42 PM

Revision Contents

PathSize
libcxx/
include/
2 lines
2 lines
__support/
ibm/
3 lines
4 lines

Diff 444767

libcxx/include/CMakeLists.txt

Show First 20 Lines • Show All 470 Lines • ▼ Show 20 Linesset(files
__ranges/zip_view.h __ranges/zip_view.h
__split_buffer __split_buffer
__std_stream __std_stream
__string/char_traits.h __string/char_traits.h
__string/extern_template_lists.h __string/extern_template_lists.h
__support/android/locale_bionic.h __support/android/locale_bionic.h
__support/fuchsia/xlocale.h __support/fuchsia/xlocale.h
__support/ibm/gettod_zos.h __support/ibm/gettod_zos.h
__support/ibm/limits.h
__support/ibm/locale_mgmt_zos.h __support/ibm/locale_mgmt_zos.h
__support/ibm/nanosleep.h __support/ibm/nanosleep.h
__support/ibm/support.h
__support/ibm/xlocale.h __support/ibm/xlocale.h
__support/musl/xlocale.h __support/musl/xlocale.h
__support/newlib/xlocale.h __support/newlib/xlocale.h
__support/openbsd/xlocale.h __support/openbsd/xlocale.h
__support/solaris/floatingpoint.h __support/solaris/floatingpoint.h
__support/solaris/wchar.h __support/solaris/wchar.h
__support/solaris/xlocale.h __support/solaris/xlocale.h
__support/win32/limits_msvc_win32.h __support/win32/limits_msvc_win32.h
▲ Show 20 Lines • Show All 326 Lines • Show Last 20 Lines

libcxx/include/__locale

Show All 27 Lines
# include <__support/android/locale_bionic.h> # include <__support/android/locale_bionic.h>
#elif defined(__sun__) #elif defined(__sun__)
# include <__support/solaris/xlocale.h> # include <__support/solaris/xlocale.h>
# include <xlocale.h> # include <xlocale.h>
#elif defined(_NEWLIB_VERSION) #elif defined(_NEWLIB_VERSION)
# include <__support/newlib/xlocale.h> # include <__support/newlib/xlocale.h>
#elif defined(__OpenBSD__) #elif defined(__OpenBSD__)
# include <__support/openbsd/xlocale.h> # include <__support/openbsd/xlocale.h>
#elif (defined(__APPLE__) || defined(__FreeBSD__) || defined(__IBMCPP__)) #elif (defined(__APPLE__) || defined(__FreeBSD__))
# include <xlocale.h> # include <xlocale.h>
#elif defined(__Fuchsia__) #elif defined(__Fuchsia__)
# include <__support/fuchsia/xlocale.h> # include <__support/fuchsia/xlocale.h>
#elif defined(__wasi__) #elif defined(__wasi__)
// WASI libc uses musl's locales support. // WASI libc uses musl's locales support.
# include <__support/musl/xlocale.h> # include <__support/musl/xlocale.h>
#elif defined(_LIBCPP_HAS_MUSL_LIBC) #elif defined(_LIBCPP_HAS_MUSL_LIBC)
# include <__support/musl/xlocale.h> # include <__support/musl/xlocale.h>
▲ Show 20 Lines • Show All 1,767 Lines • Show Last 20 Lines

libcxx/include/__support/ibm/limits.h

  • This file was deleted.
// -*- C++ -*-
//===-----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
#ifndef _LIBCPP_SUPPORT_IBM_LIMITS_H
#define _LIBCPP_SUPPORT_IBM_LIMITS_H
#if !defined(_AIX) // Linux
#include <math.h> // for HUGE_VAL, HUGE_VALF, HUGE_VALL, and NAN
static const unsigned int _QNAN_F = 0x7fc00000;
#define NANF (*((float *)(&_QNAN_F)))
static const unsigned int _QNAN_LDBL128[4] = {0x7ff80000, 0x0, 0x0, 0x0};
#define NANL (*((long double *)(&_QNAN_LDBL128)))
static const unsigned int _SNAN_F= 0x7f855555;
#define NANSF (*((float *)(&_SNAN_F)))
static const unsigned int _SNAN_D[2] = {0x7ff55555, 0x55555555};
#define NANS (*((double *)(&_SNAN_D)))
static const unsigned int _SNAN_LDBL128[4] = {0x7ff55555, 0x55555555, 0x0, 0x0};
#define NANSL (*((long double *)(&_SNAN_LDBL128)))
#define __builtin_huge_val() HUGE_VAL
#define __builtin_huge_valf() HUGE_VALF
#define __builtin_huge_vall() HUGE_VALL
#define __builtin_nan(__dummy) NAN
#define __builtin_nanf(__dummy) NANF
#define __builtin_nanl(__dummy) NANL
#define __builtin_nans(__dummy) NANS
#define __builtin_nansf(__dummy) NANSF
#define __builtin_nansl(__dummy) NANSL
#else
#include <math.h>
#include <float.h> // limit constants
#define __builtin_huge_val() HUGE_VAL //0x7ff0000000000000
#define __builtin_huge_valf() HUGE_VALF //0x7f800000
#define __builtin_huge_vall() HUGE_VALL //0x7ff0000000000000
#define __builtin_nan(__dummy) nan(__dummy) //0x7ff8000000000000
#define __builtin_nanf(__dummy) nanf(__dummy) // 0x7ff80000
#define __builtin_nanl(__dummy) nanl(__dummy) //0x7ff8000000000000
#define __builtin_nans(__dummy) DBL_SNAN //0x7ff5555555555555
#define __builtin_nansf(__dummy) FLT_SNAN //0x7f855555
#define __builtin_nansl(__dummy) DBL_SNAN //0x7ff5555555555555
#define __FLT_MANT_DIG__ FLT_MANT_DIG
#define __FLT_DIG__ FLT_DIG
#define __FLT_RADIX__ FLT_RADIX
#define __FLT_MIN_EXP__ FLT_MIN_EXP
#define __FLT_MIN_10_EXP__ FLT_MIN_10_EXP
#define __FLT_MAX_EXP__ FLT_MAX_EXP
#define __FLT_MAX_10_EXP__ FLT_MAX_10_EXP
#define __FLT_MIN__ FLT_MIN
#define __FLT_MAX__ FLT_MAX
#define __FLT_EPSILON__ FLT_EPSILON
// predefined by XLC on LoP
#define __FLT_DENORM_MIN__ 1.40129846e-45F
#define __DBL_MANT_DIG__ DBL_MANT_DIG
#define __DBL_DIG__ DBL_DIG
#define __DBL_MIN_EXP__ DBL_MIN_EXP
#define __DBL_MIN_10_EXP__ DBL_MIN_10_EXP
#define __DBL_MAX_EXP__ DBL_MAX_EXP
#define __DBL_MAX_10_EXP__ DBL_MAX_10_EXP
#define __DBL_MIN__ DBL_MIN
#define __DBL_MAX__ DBL_MAX
#define __DBL_EPSILON__ DBL_EPSILON
// predefined by XLC on LoP
#define __DBL_DENORM_MIN__ 4.9406564584124654e-324
#define __LDBL_MANT_DIG__ LDBL_MANT_DIG
#define __LDBL_DIG__ LDBL_DIG
#define __LDBL_MIN_EXP__ LDBL_MIN_EXP
#define __LDBL_MIN_10_EXP__ LDBL_MIN_10_EXP
#define __LDBL_MAX_EXP__ LDBL_MAX_EXP
#define __LDBL_MAX_10_EXP__ LDBL_MAX_10_EXP
#define __LDBL_MIN__ LDBL_MIN
#define __LDBL_MAX__ LDBL_MAX
#define __LDBL_EPSILON__ LDBL_EPSILON
// predefined by XLC on LoP
#if __LONGDOUBLE128
#define __LDBL_DENORM_MIN__ 4.94065645841246544176568792868221e-324L
#else
#define __LDBL_DENORM_MIN__ 4.9406564584124654e-324L
#endif
// predefined by XLC on LoP
#define __CHAR_BIT__ 8
#endif // _AIX
#endif // _LIBCPP_SUPPORT_IBM_LIMITS_H

libcxx/include/__support/ibm/support.h

  • This file was deleted.
// -*- C++ -*-
//===-----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
#ifndef _LIBCPP_SUPPORT_IBM_SUPPORT_H
#define _LIBCPP_SUPPORT_IBM_SUPPORT_H
extern "builtin" int __popcnt4(unsigned int);
extern "builtin" int __popcnt8(unsigned long long);
extern "builtin" unsigned int __cnttz4(unsigned int);
extern "builtin" unsigned int __cnttz8(unsigned long long);
extern "builtin" unsigned int __cntlz4(unsigned int);
extern "builtin" unsigned int __cntlz8(unsigned long long);
// Builtin functions for counting population
#define __builtin_popcount(x) __popcnt4(x)
#define __builtin_popcountll(x) __popcnt8(x)
#if defined(__64BIT__)
#define __builtin_popcountl(x) __builtin_popcountll(x)
#else
#define __builtin_popcountl(x) __builtin_popcount(x)
#endif
// Builtin functions for counting trailing zeros
#define __builtin_ctz(x) __cnttz4(x)
#define __builtin_ctzll(x) __cnttz8(x)
#if defined(__64BIT__)
#define __builtin_ctzl(x) __builtin_ctzll(x)
#else
#define __builtin_ctzl(x) __builtin_ctz(x)
#endif
// Builtin functions for counting leading zeros
#define __builtin_clz(x) __cntlz4(x)
#define __builtin_clzll(x) __cntlz8(x)
#if defined(__64BIT__)
#define __builtin_clzl(x) __builtin_clzll(x)
#else
#define __builtin_clzl(x) __builtin_clz(x)
#endif
#if defined(__64BIT__)
#define __SIZE_WIDTH__ 64
#else
#define __SIZE_WIDTH__ 32
#endif
#endif // _LIBCPP_SUPPORT_IBM_SUPPORT_H

libcxx/include/bit

Show First 20 Lines • Show All 69 Lines • ▼ Show 20 Lines
#include <limits> #include <limits>
#include <type_traits> #include <type_traits>
#include <version> #include <version>
#ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES #ifndef _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
# include <iosfwd> # include <iosfwd>
#endif #endif
#if defined(__IBMCPP__)
# include "__support/ibm/support.h"
#endif
#if defined(_LIBCPP_COMPILER_MSVC) #if defined(_LIBCPP_COMPILER_MSVC)
# include <intrin.h> # include <intrin.h>
#endif #endif
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header # pragma GCC system_header
#endif #endif
▲ Show 20 Lines • Show All 174 Lines • Show Last 20 Lines

libcxx/include/limits

Show First 20 Lines • Show All 104 Lines • ▼ Show 20 Lines
#include <__assert> // all public C++ headers provide the assertion handler #include <__assert> // all public C++ headers provide the assertion handler
#include <__config> #include <__config>
#include <type_traits> #include <type_traits>
#if defined(_LIBCPP_COMPILER_MSVC) #if defined(_LIBCPP_COMPILER_MSVC)
#include "__support/win32/limits_msvc_win32.h" #include "__support/win32/limits_msvc_win32.h"
#endif // _LIBCPP_MSVCRT #endif // _LIBCPP_MSVCRT
#if defined(__IBMCPP__)
#include "__support/ibm/limits.h"
#endif // __IBMCPP__
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header # pragma GCC system_header
#endif #endif
_LIBCPP_PUSH_MACROS _LIBCPP_PUSH_MACROS
#include <__undef_macros> #include <__undef_macros>
#include <version> #include <version>
▲ Show 20 Lines • Show All 708 Lines • Show Last 20 Lines
libcxx/include/__locale