Skip to content
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

[Flang] Exclude the reference to TIME_UTC for AIX. #99069

Merged
merged 1 commit into from
Jul 17, 2024

Conversation

DanielCChen
Copy link
Contributor

This PR supersede PR #98915

Sorry that I messed up my git branch so I post this one to sort it out.

@DanielCChen DanielCChen requested a review from mjklemm July 16, 2024 18:05
@DanielCChen DanielCChen self-assigned this Jul 16, 2024
@llvmbot llvmbot added the flang Flang issues not falling into any other category label Jul 16, 2024
@llvmbot
Copy link
Collaborator

llvmbot commented Jul 16, 2024

@llvm/pr-subscribers-flang-runtime

Author: Daniel Chen (DanielCChen)

Changes

This PR supersede PR #98915

Sorry that I messed up my git branch so I post this one to sort it out.


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

1 Files Affected:

  • (modified) flang/runtime/time-intrinsic.cpp (+2)
diff --git a/flang/runtime/time-intrinsic.cpp b/flang/runtime/time-intrinsic.cpp
index 7352dafc9136e..92b937bc6f626 100644
--- a/flang/runtime/time-intrinsic.cpp
+++ b/flang/runtime/time-intrinsic.cpp
@@ -139,6 +139,7 @@ count_t ConvertTimeSpecToCount(int kind, const struct timespec &tspec) {
   }
 }
 
+#ifndef _AIX
 // This is the fallback implementation, which should work everywhere.
 template <typename Unused = void>
 count_t GetSystemClockCount(int kind, fallback_implementation) {
@@ -153,6 +154,7 @@ count_t GetSystemClockCount(int kind, fallback_implementation) {
   // with the requested kind at the call site.
   return ConvertTimeSpecToCount(kind, tspec);
 }
+#endif
 
 template <typename Unused = void>
 count_t GetSystemClockCountRate(int kind, fallback_implementation) {

Copy link
Contributor

@mjklemm mjklemm left a comment

Choose a reason for hiding this comment

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

LGTM

@DanielCChen DanielCChen merged commit fa0e529 into llvm:main Jul 17, 2024
5 of 6 checks passed
@DanielCChen DanielCChen deleted the danielcchen_time branch July 17, 2024 12:11
sgundapa pushed a commit to sgundapa/upstream_effort that referenced this pull request Jul 23, 2024
yuxuanchen1997 pushed a commit that referenced this pull request Jul 25, 2024
Summary: This PR supersede PR #98915

Test Plan: 

Reviewers: 

Subscribers: 

Tasks: 

Tags: 


Differential Revision: https://phabricator.intern.facebook.com/D60251003
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
flang:runtime flang Flang issues not falling into any other category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants