Skip to content

Get cxx03 headers working on z/OS #132992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Get cxx03 headers working on z/OS #132992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f87f19b
Get cxx03 headers working on z/OS
perry-ca Mar 25, 2025
bf5d940
resolve conflict
perry-ca Oct 29, 2025
d18c8d4
Merge branch 'main' into perry/libcxx03-zos
perry-ca Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions libcxx/include/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,6 @@ set(files
__string/char_traits.h
__string/constexpr_c_functions.h
__string/extern_template_lists.h
__support/ibm/gettod_zos.h
__support/ibm/locale_mgmt_zos.h
__support/ibm/nanosleep.h
__support/xlocale/__nop_locale_mgmt.h
Expand Down Expand Up @@ -1300,7 +1299,6 @@ set(files
__cxx03/__locale_dir/locale_base_api/bsd_locale_defaults.h
__cxx03/__locale_dir/locale_base_api/bsd_locale_fallbacks.h
__cxx03/__locale_dir/locale_base_api/fuchsia.h
__cxx03/__locale_dir/locale_base_api/ibm.h
__cxx03/__locale_dir/locale_base_api/locale_guard.h
__cxx03/__locale_dir/locale_base_api/musl.h
__cxx03/__locale_dir/locale_base_api/newlib.h
Expand Down Expand Up @@ -1404,9 +1402,6 @@ set(files
__cxx03/__string/char_traits.h
__cxx03/__string/constexpr_c_functions.h
__cxx03/__string/extern_template_lists.h
__cxx03/__support/ibm/gettod_zos.h
__cxx03/__support/ibm/locale_mgmt_zos.h
__cxx03/__support/ibm/nanosleep.h
__cxx03/__support/xlocale/__nop_locale_mgmt.h
__cxx03/__support/xlocale/__posix_l_fallback.h
__cxx03/__support/xlocale/__strtonum_fallback.h
Expand Down
2 changes: 1 addition & 1 deletion libcxx/include/__cxx03/__locale_dir/locale_base_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#if defined(_LIBCPP_MSVCRT_LIKE)
# include <__cxx03/__locale_dir/locale_base_api/win32.h>
#elif defined(_AIX) || defined(__MVS__)
# include <__cxx03/__locale_dir/locale_base_api/ibm.h>
# include <__locale_dir/locale_base_api/ibm.h>
#elif defined(__ANDROID__)
# include <__cxx03/__locale_dir/locale_base_api/android.h>
#elif defined(__sun__)
Expand Down
108 changes: 0 additions & 108 deletions libcxx/include/__cxx03/__locale_dir/locale_base_api/ibm.h
View file
Open in desktop

This file was deleted.

52 changes: 0 additions & 52 deletions libcxx/include/__cxx03/__support/ibm/gettod_zos.h
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions libcxx/include/__cxx03/__support/ibm/locale_mgmt_zos.h
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions libcxx/include/__cxx03/__support/ibm/nanosleep.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion libcxx/include/__cxx03/__thread/support/pthread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <sched.h>

#ifdef __MVS__
# include <__cxx03/__support/ibm/nanosleep.h>
# include <__support/ibm/nanosleep.h>
#endif

// Some platforms require <bits/atomic_wide_counter.h> in order for
Expand Down
2 changes: 1 addition & 1 deletion libcxx/src/chrono.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <chrono>

#if defined(__MVS__)
# include <__support/ibm/gettod_zos.h> // gettimeofdayMonotonic
# include <support/ibm/gettod_zos.h> // gettimeofdayMonotonic
#endif

#include "include/apple_availability.h"
Expand Down
0 libcxx/include/__support/ibm/gettod_zos.h → libcxx/src/support/ibm/gettod_zos.h
View file
Open in desktop
File renamed without changes.
Loading