ALT-TEST #6228
Draft
ALT-TEST #6228
+37
−18
Conversation
This file contains 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
This is part of a sequence of commits to restore build on the XCODE5 toolchain. The definition is required on other toolchains, but on XCODE5 results in a macro redefined error (from the existing value 255) from /usr/include/stdint.h. Signed-off-by: Mike Beaton <[email protected]>
Addresses https://bugzilla.tianocore.org/show_bug.cgi?id=3704 Without these changes, we get the error: error: variable '__DebugCodeLocal' set but not used from the DebugLib.h DEBUG_CODE_BEGIN()/END() macros on XCODE5. Similarly, in NOOPT builds only, we get: error: variable '__PerformanceCodeLocal' set but not used from the PerformanceLib.h PERF_CODE_BEGIN()/END() macros on XCODE5. The modified versions work on all toolchains. The previous definitions of DEBUG_CODE_BEGIN() and DEBUG_CODE_END() use the local variable __DebugCodeLocal as an attempt to track parity: if DEBUG_CODE_END() is used without a preceding DEBUG_CODE_BEGIN(), __DebugCodeLocal will not have been declared and a compilation error will be issued. These mutations of the variable are not used to track nesting or similar. As the value of this variable is never actually used, recent Clang versions issue an "unused-but-set-variable" warning for it. To solve this, redefine __DebugCodeLocal as a BOOLEAN that is always FALSE and use it in a do-while loop condition as done explicitly in many places. As in the previous solution, DEBUG_CODE_END() cannot be used without DEBUG_CODE_BEGIN(), as __DebugCodeLocal will be not have been defined. Also make the matching change in the PERF_CODE_BEGIN()/END() macros. Signed-off-by: Marvin Häuser <[email protected]> Signed-off-by: Mikhail Krichanov <[email protected]> Signed-off-by: Mike Beaton <[email protected]>
Without this change we get: error: equality comparison with extraneous parentheses when building on XCODE5. Signed-off-by: Mike Beaton <[email protected]>
REF: https://edk2.groups.io/g/devel/message/88179 Without this change, we get: fatal error: 'Availability.h' file not found when building on XCODE5. The workaround uses a define present in openssl/include/crypto/rand.h which modifies openssl behaviour on Apple only, causing the library to default to a non-system specific source of entropy in syscall_random() in rand_unix.c. Signed-off-by: Savva Mitrofanov <[email protected]> Signed-off-by: Mike Beaton <[email protected]>
Without this change we get: error: variable 'Index' set but not used when building on XCODE5. Signed-off-by: Savva Mitrofanov <[email protected]> Signed-off-by: Mike Beaton <[email protected]>
Without this change we get: error: equality comparison with extraneous parentheses when building with -D NETWORK_IP6_ENABLE on XCODE5. Signed-off-by: Mike Beaton <[email protected]>
tianocore-assign-reviewers
bot
requested review from
ajfish,
bcran,
BobCF,
jyao1,
leiflindholm,
lgao4,
LiuZhiguang001,
liyi77,
mdkinney,
SaloniKasbekar,
YuweiChen1110 and
Zclarkwilliams
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.
No description provided.