[libc] Use proxy headers for limits.h values
#102378
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jhuber6
requested review from
lntue,
michaelrj-google,
SchrodingerZhu and
sylvestre
|
@llvm/pr-subscribers-libc Author: Joseph Huber (jhuber6) ChangesSummary: Fixes: #102368 Full diff: https://github.com/llvm/llvm-project/pull/102378.diff 1 Files Affected:
diff --git a/libc/src/__support/CPP/limits.h b/libc/src/__support/CPP/limits.h
index 686abcaea9880..34b7b7df262f4 100644
--- a/libc/src/__support/CPP/limits.h
+++ b/libc/src/__support/CPP/limits.h
@@ -9,10 +9,10 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_CPP_LIMITS_H
#define LLVM_LIBC_SRC___SUPPORT_CPP_LIMITS_H
-#include "include/llvm-libc-macros/limits-macros.h" // CHAR_BIT
+#include "hdr/limits-macros.h" // CHAR_BIT
#include "src/__support/CPP/type_traits/is_integral.h"
#include "src/__support/CPP/type_traits/is_signed.h"
-#include "src/__support/macros/attributes.h" // LIBC_INLINE
+#include "src/__support/macros/attributes.h" // LIBC_INLINE
#include "src/__support/macros/config.h"
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
|
michaelrj-google
approved these changes
Aug 7, 2024
There was a problem hiding this comment.
Overall LGTM but also remember to update the cmake and the bazel. Here's the diff that fixes the bazel:
diff --git a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
index 253b89216a88..e52bf2782638 100644
--- a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
@@ -150,6 +150,12 @@ libc_support_library(
hdrs = ["hdr/stdio_macros.h"],
)
+
+libc_support_library(
+ name = "hdr_limits_macros",
+ hdrs = ["hdr/limits_macros.h"],
+)
+
############################ Type Proxy Header Files ###########################
libc_support_library(
@@ -362,7 +368,7 @@ libc_support_library(
"__support_cpp_type_traits",
"__support_macros_attributes",
":__support_macros_properties_types",
- ":llvm_libc_macros_limits_macros",
+ ":hdr_limits_macros",
],
)
libc/src/__support/CPP/limits.h
Outdated
| @@ -9,10 +9,10 @@ | |||
| #ifndef LLVM_LIBC_SRC___SUPPORT_CPP_LIMITS_H | |||
| #define LLVM_LIBC_SRC___SUPPORT_CPP_LIMITS_H | |||
|
|
|||
| #include "include/llvm-libc-macros/limits-macros.h" // CHAR_BIT | |||
| #include "hdr/limits-macros.h" // CHAR_BIT | |||
There was a problem hiding this comment.
Suggested change
| #include "hdr/limits-macros.h" // CHAR_BIT | |
| #include "hdr/limits_macros.h" // CHAR_BIT |
Summary: This defines some constants that may conflict with the system when in overlay mode. Use the proxy header instead. Fixes: llvm#102368
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary:
This defines some constants that may conflict with the system when in
overlay mode. Use the proxy header instead.
Fixes: #102368