This reverts commit 357cec385d4f ("MdePkg: avoid __builtin_unreachable()
on GCC v4.4", 2016-07-21).We've removed BaseTools support for GCC44..GCC47, therefore we need not catch the GCC44 corner case for __builtin_unreachable(). No GCC44..GCC47 references remain under MdePkg after this patch. Cc: Ard Biesheuvel <ard.biesheu...@linaro.org> Cc: Liming Gao <liming....@intel.com> Cc: Marvin Haeuser <marvin.haeu...@outlook.com> Cc: Michael D Kinney <michael.d.kin...@intel.com> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1377 Signed-off-by: Laszlo Ersek <ler...@redhat.com> --- Notes: I build-tested this change by building ArmVirtQemu with the GCC5 toolchain (gcc-6.1.1), and OVMF with the GCC48 toolchain (gcc-4.8.5). Namely, the PeiCore() function [MdeModulePkg/Core/Pei/PeiMain/PeiMain.c] and the DxeMain() function [MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c] use UNREACHABLE(). MdePkg/Include/Base.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h index bc877d8125a5..d6b04baeaf8b 100644 --- a/MdePkg/Include/Base.h +++ b/MdePkg/Include/Base.h @@ -112,11 +112,10 @@ VERIFY_SIZE_OF (__VERIFY_UINT32_ENUM_SIZE, 4); // warnings. // #ifndef UNREACHABLE - #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 4) + #ifdef __GNUC__ /// /// Signal compilers and analyzers that this call is not reachable. It is /// up to the compiler to remove any code past that point. - /// Not implemented by GCC 4.4 or earlier. /// #define UNREACHABLE() __builtin_unreachable () #elif defined (__has_feature) -- 2.19.1.3.g30247aa5d201 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
