[libc] Fix missing default value for errno config #100175
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
|
@llvm/pr-subscribers-libc Author: Joseph Huber (jhuber6) ChangesSummary: Full diff: https://github.com/llvm/llvm-project/pull/100175.diff 2 Files Affected:
diff --git a/libc/cmake/modules/LibcConfig.cmake b/libc/cmake/modules/LibcConfig.cmake
index 7a3e6066b3cc0..da166dd6cc3fc 100644
--- a/libc/cmake/modules/LibcConfig.cmake
+++ b/libc/cmake/modules/LibcConfig.cmake
@@ -113,7 +113,7 @@ function(load_libc_config config_file)
message(FATAL_ERROR ${json_error})
endif()
if(NOT DEFINED ${opt_name})
- message(FATAL_ERROR: " Option ${opt_name} defined in ${config_file} is invalid.")
+ message(FATAL_ERROR " Option ${opt_name} defined in ${config_file} is invalid.")
endif()
if(ARGN)
list(FIND ARGN ${opt_name} optname_exists)
diff --git a/libc/config/config.json b/libc/config/config.json
index 2005f4297bfc1..f134a0f41cf56 100644
--- a/libc/config/config.json
+++ b/libc/config/config.json
@@ -1,7 +1,7 @@
{
"errno": {
"LIBC_CONF_ERRNO_MODE": {
- "value": "",
+ "value": "LIBC_ERRNO_MODE_THREAD_LOCAL",
"doc": "The implementation used for errno, acceptable values are LIBC_ERRNO_MODE_UNDEFINED, LIBC_ERRNO_MODE_THREAD_LOCAL, LIBC_ERRNO_MODE_SHARED, LIBC_ERRNO_MODE_EXTERNAL, and LIBC_ERRNO_MODE_SYSTEM."
}
},
|
lntue
reviewed
Jul 23, 2024
lntue
reviewed
Jul 23, 2024
| @@ -23,7 +25,8 @@ | |||
| // fullbuild mode, effectively the same as `LIBC_ERRNO_MODE_EXTERNAL`. | |||
| #define LIBC_ERRNO_MODE_SYSTEM 5 | |||
|
|
|||
| #ifndef LIBC_ERRNO_MODE | |||
| #if !defined(LIBC_ERRNO_MODE) || LIBC_ERRNO_MODE == LIBC_ERRNO_MODE_DEFAULT | |||
There was a problem hiding this comment.
Can you add LIBC_ERRNO_MODE_DEFAULT to the #error message below?
jhuber6
commented
Jul 23, 2024
jhuber6
commented
Jul 23, 2024
lntue
reviewed
Jul 23, 2024
| #if defined(LIBC_FULL_BUILD) || !defined(LIBC_COPT_PUBLIC_PACKAGING) | ||
| #define LIBC_ERRNO_MODE LIBC_ERRNO_MODE_THREAD_LOCAL | ||
| #else | ||
| #define LIBC_ERRNO_MODE LIBC_ERRNO_MODE_SYSTEM | ||
| #endif | ||
| #endif // LIBC_ERRNO_MODE | ||
|
|
||
| #if LIBC_ERRNO_MODE != LIBC_ERRNO_MODE_UNDEFINED && \ | ||
| #if LIBC_ERRNO_MODE != LIBC_ERRNO_MODE_DEFAULT && \ |
There was a problem hiding this comment.
add LIBC_ERRNO_MODE_DEFAULT to L44 below.
Summary: The configs all need default values which targets then override. This one was an empty string which made the logic report an error. The only reason it wasn't a build failure was because of a stray `:`.
lntue
approved these changes
Jul 23, 2024
yuxuanchen1997
pushed a commit
that referenced
this pull request
Jul 25, 2024
Summary: The configs all need default values which targets then override. This one was an empty string which made the logic report an error. The only reason it wasn't a build failure was because of a stray `:`.
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:
The configs all need default values which targets then override. This
one was an empty string which made the logic report an error. The only
reason it wasn't a build failure was because of a stray
:.