Skip to content

[z/OS] Make sure __alignas_is_defined and __alignof_is_defined are defined on z/OS. #115368

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.

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

Merged
merged 1 commit into from
Nov 8, 2024

Conversation

zibi2
Copy link
Contributor

@zibi2 zibi2 commented Nov 7, 2024

No description provided.

@zibi2 zibi2 requested review from perry-ca and abhina-sree November 7, 2024 20:16
@zibi2 zibi2 self-assigned this Nov 7, 2024
@llvmbot llvmbot added clang Clang issues not falling into any other category backend:X86 clang:headers Headers provided by Clang, e.g. for intrinsics labels Nov 7, 2024
@llvmbot
Copy link
Member

llvmbot commented Nov 7, 2024

@llvm/pr-subscribers-clang

Author: Zibi Sarbinowski (zibi2)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/115368.diff

1 Files Affected:

  • (modified) clang/lib/Headers/stdalign.h (-5)
diff --git a/clang/lib/Headers/stdalign.h b/clang/lib/Headers/stdalign.h
index 56cdfa52d4bafa..158508e65d2b34 100644
--- a/clang/lib/Headers/stdalign.h
+++ b/clang/lib/Headers/stdalign.h
@@ -10,10 +10,6 @@
 #ifndef __STDALIGN_H
 #define __STDALIGN_H
 
-#if defined(__MVS__) && __has_include_next(<stdalign.h>)
-#include_next <stdalign.h>
-#else
-
 #if defined(__cplusplus) ||                                                    \
     (defined(__STDC_VERSION__) && __STDC_VERSION__ < 202311L)
 #ifndef __cplusplus
@@ -25,5 +21,4 @@
 #define __alignof_is_defined 1
 #endif /* __STDC_VERSION__ */
 
-#endif /* __MVS__ */
 #endif /* __STDALIGN_H */

@llvmbot
Copy link
Member

llvmbot commented Nov 7, 2024

@llvm/pr-subscribers-backend-x86

Author: Zibi Sarbinowski (zibi2)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/115368.diff

1 Files Affected:

  • (modified) clang/lib/Headers/stdalign.h (-5)
diff --git a/clang/lib/Headers/stdalign.h b/clang/lib/Headers/stdalign.h
index 56cdfa52d4bafa..158508e65d2b34 100644
--- a/clang/lib/Headers/stdalign.h
+++ b/clang/lib/Headers/stdalign.h
@@ -10,10 +10,6 @@
 #ifndef __STDALIGN_H
 #define __STDALIGN_H
 
-#if defined(__MVS__) && __has_include_next(<stdalign.h>)
-#include_next <stdalign.h>
-#else
-
 #if defined(__cplusplus) ||                                                    \
     (defined(__STDC_VERSION__) && __STDC_VERSION__ < 202311L)
 #ifndef __cplusplus
@@ -25,5 +21,4 @@
 #define __alignof_is_defined 1
 #endif /* __STDC_VERSION__ */
 
-#endif /* __MVS__ */
 #endif /* __STDALIGN_H */

Copy link
Contributor

@abhina-sree abhina-sree left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@zibi2 zibi2 merged commit 724b432 into llvm:main Nov 8, 2024
12 checks passed
Groverkss pushed a commit to iree-org/llvm-project that referenced this pull request Nov 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backend:X86 clang:headers Headers provided by Clang, e.g. for intrinsics clang Clang issues not falling into any other category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants