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

[libc] Fix vdso VER_FLG_BASE redefinition in overlay mod. #108628

Merged
merged 1 commit into from
Sep 13, 2024
Merged

Conversation

lntue
Copy link
Contributor

@lntue lntue commented Sep 13, 2024

No description provided.

@llvmbot
Copy link
Member

llvmbot commented Sep 13, 2024

@llvm/pr-subscribers-libc

Author: None (lntue)

Changes

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

1 Files Affected:

  • (modified) libc/src/__support/OSUtil/linux/vdso.cpp (+2)
diff --git a/libc/src/__support/OSUtil/linux/vdso.cpp b/libc/src/__support/OSUtil/linux/vdso.cpp
index cb43764badad1f..8c9bd3e1bcc72b 100644
--- a/libc/src/__support/OSUtil/linux/vdso.cpp
+++ b/libc/src/__support/OSUtil/linux/vdso.cpp
@@ -57,7 +57,9 @@ struct Verdef {
 // https://refspecs.linuxfoundation.org/LSB_1.3.0/gLSB/gLSB/symversion.html#SYMVERTBL
 cpp::string_view find_version(Verdef *verdef, ElfW(Half) * versym,
                               const char *strtab, size_t idx) {
+#ifndef VER_FLG_BASE
   constexpr ElfW(Half) VER_FLG_BASE = 0x1;
+#endif
   if (!versym)
     return "";
   ElfW(Half) identifier = versym[idx] & 0x7FFF;

@lntue lntue merged commit b659abe into llvm:main Sep 13, 2024
6 of 7 checks passed
@lntue lntue deleted the vdso branch September 13, 2024 19:06
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