Skip to content

[lldb] Remove pre GCC 4.8 workaround #73981

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
Dec 1, 2023
Merged

Conversation

brad0
Copy link
Contributor

@brad0 brad0 commented Nov 30, 2023

The minimum GCC version was bumped up from 4.8 to 5.1 and then even newer
awhile ago so garbage collect the pre 4.8 workaround.

https://reviews.llvm.org/D66188

The minimum GCC version was bumped up from 4.8 to 5.1 and then even newer
awhile ago so garbage collect the pre 4.8 workaround.

https://reviews.llvm.org/D66188
@brad0 brad0 requested a review from omjavaid November 30, 2023 20:27
@brad0 brad0 requested a review from JDevlieghere as a code owner November 30, 2023 20:27
@llvmbot llvmbot added the lldb label Nov 30, 2023
@llvmbot
Copy link
Member

llvmbot commented Nov 30, 2023

@llvm/pr-subscribers-lldb

Author: Brad Smith (brad0)

Changes

The minimum GCC version was bumped up from 4.8 to 5.1 and then even newer
awhile ago so garbage collect the pre 4.8 workaround.

https://reviews.llvm.org/D66188


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

1 Files Affected:

  • (modified) lldb/source/Host/common/Host.cpp (-4)
diff --git a/lldb/source/Host/common/Host.cpp b/lldb/source/Host/common/Host.cpp
index 49eac0b0fa7b0c6..8314d3581f6a47f 100644
--- a/lldb/source/Host/common/Host.cpp
+++ b/lldb/source/Host/common/Host.cpp
@@ -133,11 +133,7 @@ class ScopedPThreadCancelDisabler {
 #endif // __linux__
 
 #ifdef __linux__
-#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8))
-static __thread volatile sig_atomic_t g_usr1_called;
-#else
 static thread_local volatile sig_atomic_t g_usr1_called;
-#endif
 
 static void SigUsr1Handler(int) { g_usr1_called = 1; }
 #endif // __linux__

Copy link
Member

@bulbazord bulbazord left a comment

Choose a reason for hiding this comment

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

LGTM

From the look of it, it looks like the minimum version of GCC that is currently supported is 7.1. (See: llvm/cmake/modules/CheckCompilerVersion.cmake)

@brad0
Copy link
Contributor Author

brad0 commented Nov 30, 2023

From the look of it, it looks like the minimum version of GCC that is currently supported is 7.1. (See: llvm/cmake/modules/CheckCompilerVersion.cmake)

It was 7.1, it is now 7.4.

https://reviews.llvm.org/D156286

@brad0 brad0 merged commit a37c69e into llvm:main Dec 1, 2023
@brad0 brad0 deleted the lldb_gcc_4_workaround branch December 1, 2023 04:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants