diff --git a/devel/gcc-arm-embedded/files/patch-binutils-gdb--gdb_gdb_unittests_enum-flags-selftests.c b/devel/gcc-arm-embedded/files/patch-binutils-gdb--gdb_gdb_unittests_enum-flags-selftests.c new file mode 100644 index 000000000000..3819039c420b --- /dev/null +++ b/devel/gcc-arm-embedded/files/patch-binutils-gdb--gdb_gdb_unittests_enum-flags-selftests.c @@ -0,0 +1,36 @@ +--- binutils-gdb--gdb/gdb/unittests/enum-flags-selftests.c.orig 2024-11-30 00:01:16 UTC ++++ binutils-gdb--gdb/gdb/unittests/enum-flags-selftests.c +@@ -233,33 +233,6 @@ CHECK_VALID (true, EF, true ? RE () : EF ()) + CHECK_VALID (true, EF, true ? EF () : RE ()) + CHECK_VALID (true, EF, true ? RE () : EF ()) + +-/* These are valid, but it's not a big deal since you won't be able to +- assign the resulting integer to an enum or an enum_flags without a +- cast. +- +- The latter two tests are disabled on older GCCs because they +- incorrectly fail with gcc 4.8 and 4.9 at least. Running the test +- outside a SFINAE context shows: +- +- invalid user-defined conversion from ‘EF’ to ‘RE2’ +- +- They've been confirmed to compile/pass with gcc 5.3, gcc 7.1 and +- clang 3.7. */ +- +-CHECK_VALID (true, int, true ? EF () : EF2 ()) +-CHECK_VALID (true, int, true ? EF2 () : EF ()) +-CHECK_VALID (true, int, true ? EF () : RE2 ()) +-CHECK_VALID (true, int, true ? RE2 () : EF ()) +- +-/* Same, but with an unsigned enum. */ +- +-typedef unsigned int uns; +- +-CHECK_VALID (true, uns, true ? EF () : UEF ()) +-CHECK_VALID (true, uns, true ? UEF () : EF ()) +-CHECK_VALID (true, uns, true ? EF () : URE ()) +-CHECK_VALID (true, uns, true ? URE () : EF ()) +- + /* Unfortunately this can't work due to the way C++ computes the + return type of the ternary conditional operator. int isn't + implicitly convertible to the raw enum type, so the type of the diff --git a/devel/gcc-arm-embedded/files/patch-binutils-gdb--gdb_gdbsupport_enum-flags.h b/devel/gcc-arm-embedded/files/patch-binutils-gdb--gdb_gdbsupport_enum-flags.h new file mode 100644 index 000000000000..de82593c10f0 --- /dev/null +++ b/devel/gcc-arm-embedded/files/patch-binutils-gdb--gdb_gdbsupport_enum-flags.h @@ -0,0 +1,156 @@ +--- binutils-gdb--gdb/gdbsupport/enum-flags.h.orig 2024-11-30 00:01:16 UTC ++++ binutils-gdb--gdb/gdbsupport/enum-flags.h +@@ -75,30 +75,6 @@ + namespace. The compiler finds the corresponding + is_enum_flags_enum_type function via ADL. */ + +-/* Note that std::underlying_type is not what we want here, +- since that returns unsigned int even when the enum decays to signed +- int. */ +-template class integer_for_size { typedef void type; }; +-template<> struct integer_for_size<1, 0> { typedef uint8_t type; }; +-template<> struct integer_for_size<2, 0> { typedef uint16_t type; }; +-template<> struct integer_for_size<4, 0> { typedef uint32_t type; }; +-template<> struct integer_for_size<8, 0> { typedef uint64_t type; }; +-template<> struct integer_for_size<1, 1> { typedef int8_t type; }; +-template<> struct integer_for_size<2, 1> { typedef int16_t type; }; +-template<> struct integer_for_size<4, 1> { typedef int32_t type; }; +-template<> struct integer_for_size<8, 1> { typedef int64_t type; }; +- +-template +-struct enum_underlying_type +-{ +- DIAGNOSTIC_PUSH +- DIAGNOSTIC_IGNORE_ENUM_CONSTEXPR_CONVERSION +- typedef typename +- integer_for_size(T (-1) < T (0))>::type +- type; +- DIAGNOSTIC_POP +-}; +- + namespace enum_flags_detail + { + +@@ -119,11 +95,62 @@ using EnumIsUnsigned + /* gdb::Requires trait helpers. */ + template + using EnumIsUnsigned +- = std::is_unsigned::type>; ++ = std::is_unsigned::type>; ++ ++/* Helper to detect whether an enum has a fixed underlying type. This can be ++ achieved by using a scoped enum (in which case the type is "int") or ++ an explicit underlying type. C-style enums that are unscoped or do not ++ have an explicit underlying type have an implementation-defined underlying ++ type. ++ ++ https://timsong-cpp.github.io/cppwp/n4659/dcl.enum#5 ++ ++ We need this trait in order to ensure that operator~ below does NOT ++ operate on old-style enums. This is because we apply operator~ on ++ the value and then cast the result to the enum_type. This is however ++ Undefined Behavior if the result does not fit in the range of possible ++ values for the enum. For enums with fixed underlying type, the entire ++ range of the integer is available. However, for old-style enums, the range ++ is only the smallest bit-field that can hold all the values of the ++ enumeration, typically much smaller than the underlying integer: ++ ++ https://timsong-cpp.github.io/cppwp/n4659/expr.static.cast#10 ++ https://timsong-cpp.github.io/cppwp/n4659/dcl.enum#8 ++ ++ To implement this, we leverage the fact that, since C++17, enums with ++ fixed underlying type can be list-initialized from an integer: ++ https://timsong-cpp.github.io/cppwp/n4659/dcl.init.list#3.7 ++ ++ Old-style enums cannot be initialized like that, leading to ill-formed ++ code. ++ ++ We then use this together with SFINAE to create the desired trait. ++ ++*/ ++template ++struct EnumHasFixedUnderlyingType : std::false_type ++{ ++ static_assert(std::is_enum::value); ++}; ++ ++/* Specialization that is active only if enum_type can be ++ list-initialized from an integer (0). Only enums with fixed ++ underlying type satisfy this property in C++17. */ + template +-using EnumIsSigned +- = std::is_signed::type>; ++struct EnumHasFixedUnderlyingType> : std::true_type ++{ ++ static_assert(std::is_enum::value); ++}; + ++template ++using EnumIsSafeForBitwiseComplement = std::conjunction< ++ EnumIsUnsigned, ++ EnumHasFixedUnderlyingType ++>; ++ ++template ++using EnumIsUnsafeForBitwiseComplement = std::negation>; ++ + } + + template +@@ -131,7 +158,7 @@ class enum_flags (public) + { + public: + typedef E enum_type; +- typedef typename enum_underlying_type::type underlying_type; ++ typedef typename std::underlying_type::type underlying_type; + + /* For to_string. Maps one enumerator of E to a string. */ + struct string_mapping +@@ -394,33 +421,41 @@ template , + typename +- = gdb::Requires>> ++ = gdb::Requires>> + constexpr enum_type + operator~ (enum_type e) + { + using underlying = typename enum_flags::underlying_type; +- return (enum_type) ~underlying (e); ++ /* Cast to ULONGEST first, to prevent integer promotions from enums ++ with fixed underlying type std::uint8_t or std::uint16_t to ++ signed int. This ensures we apply the bitwise complement on an ++ unsigned type. */ ++ return (enum_type)(underlying) ~ULONGEST (e); + } + + template , +- typename = gdb::Requires>> ++ typename = gdb::Requires>> + constexpr void operator~ (enum_type e) = delete; + + template , + typename +- = gdb::Requires>> ++ = gdb::Requires>> + constexpr enum_flags + operator~ (enum_flags e) + { + using underlying = typename enum_flags::underlying_type; +- return (enum_type) ~underlying (e); ++ /* Cast to ULONGEST first, to prevent integer promotions from enums ++ with fixed underlying type std::uint8_t or std::uint16_t to ++ signed int. This ensures we apply the bitwise complement on an ++ unsigned type. */ ++ return (enum_type)(underlying) ~ULONGEST (e); + } + + template , +- typename = gdb::Requires>> ++ typename = gdb::Requires>> + constexpr void operator~ (enum_flags e) = delete; + + /* Delete operator<< and operator>>. */ diff --git a/devel/gcc-arm-embedded/files/patch-binutils-gdb--gdb_include_diagnostics.h b/devel/gcc-arm-embedded/files/patch-binutils-gdb--gdb_include_diagnostics.h new file mode 100644 index 000000000000..109e6c4fe8c5 --- /dev/null +++ b/devel/gcc-arm-embedded/files/patch-binutils-gdb--gdb_include_diagnostics.h @@ -0,0 +1,25 @@ +--- binutils-gdb--gdb/include/diagnostics.h.orig 2024-11-30 00:01:16 UTC ++++ binutils-gdb--gdb/include/diagnostics.h +@@ -76,11 +76,6 @@ + # define DIAGNOSTIC_ERROR_SWITCH \ + DIAGNOSTIC_ERROR ("-Wswitch") + +-# if __has_warning ("-Wenum-constexpr-conversion") +-# define DIAGNOSTIC_IGNORE_ENUM_CONSTEXPR_CONVERSION \ +- DIAGNOSTIC_IGNORE ("-Wenum-constexpr-conversion") +-# endif +- + #elif defined (__GNUC__) /* GCC */ + + # define DIAGNOSTIC_IGNORE_DEPRECATED_DECLARATIONS \ +@@ -157,10 +152,6 @@ + + #ifndef DIAGNOSTIC_ERROR_SWITCH + # define DIAGNOSTIC_ERROR_SWITCH +-#endif +- +-#ifndef DIAGNOSTIC_IGNORE_ENUM_CONSTEXPR_CONVERSION +-# define DIAGNOSTIC_IGNORE_ENUM_CONSTEXPR_CONVERSION + #endif + + #endif /* DIAGNOSTICS_H */ diff --git a/devel/gcc-arm-embedded/files/patch-binutils-gdb_binutils_readelf.c b/devel/gcc-arm-embedded/files/patch-binutils-gdb_binutils_readelf.c new file mode 100644 index 000000000000..15329156a357 --- /dev/null +++ b/devel/gcc-arm-embedded/files/patch-binutils-gdb_binutils_readelf.c @@ -0,0 +1,11 @@ +--- binutils-gdb/binutils/readelf.c.orig 2024-11-20 17:30:17 UTC ++++ binutils-gdb/binutils/readelf.c +@@ -23275,7 +23275,7 @@ process_v850_notes (Filedata * filedata, uint64_t offs + + /* Prevent out-of-bounds indexing. */ + if ( inote.namedata + inote.namesz > end +- || inote.namedata + inote.namesz < inote.namedata) ++ || (uintptr_t)inote.namedata + inote.namesz < (uintptr_t)inote.namedata) + { + warn (_("corrupt namesz found in note at offset %#zx\n"), + (char *) external - (char *) pnotes); diff --git a/devel/gcc-arm-embedded/files/patch-binutils-gdb_gdb_unittests_enum-flags-selftests.c b/devel/gcc-arm-embedded/files/patch-binutils-gdb_gdb_unittests_enum-flags-selftests.c new file mode 100644 index 000000000000..d402a5ebbf08 --- /dev/null +++ b/devel/gcc-arm-embedded/files/patch-binutils-gdb_gdb_unittests_enum-flags-selftests.c @@ -0,0 +1,36 @@ +--- binutils-gdb/gdb/unittests/enum-flags-selftests.c.orig 2024-11-20 17:30:17 UTC ++++ binutils-gdb/gdb/unittests/enum-flags-selftests.c +@@ -233,33 +233,6 @@ CHECK_VALID (true, EF, true ? RE () : EF ()) + CHECK_VALID (true, EF, true ? EF () : RE ()) + CHECK_VALID (true, EF, true ? RE () : EF ()) + +-/* These are valid, but it's not a big deal since you won't be able to +- assign the resulting integer to an enum or an enum_flags without a +- cast. +- +- The latter two tests are disabled on older GCCs because they +- incorrectly fail with gcc 4.8 and 4.9 at least. Running the test +- outside a SFINAE context shows: +- +- invalid user-defined conversion from ‘EF’ to ‘RE2’ +- +- They've been confirmed to compile/pass with gcc 5.3, gcc 7.1 and +- clang 3.7. */ +- +-CHECK_VALID (true, int, true ? EF () : EF2 ()) +-CHECK_VALID (true, int, true ? EF2 () : EF ()) +-CHECK_VALID (true, int, true ? EF () : RE2 ()) +-CHECK_VALID (true, int, true ? RE2 () : EF ()) +- +-/* Same, but with an unsigned enum. */ +- +-typedef unsigned int uns; +- +-CHECK_VALID (true, uns, true ? EF () : UEF ()) +-CHECK_VALID (true, uns, true ? UEF () : EF ()) +-CHECK_VALID (true, uns, true ? EF () : URE ()) +-CHECK_VALID (true, uns, true ? URE () : EF ()) +- + /* Unfortunately this can't work due to the way C++ computes the + return type of the ternary conditional operator. int isn't + implicitly convertible to the raw enum type, so the type of the diff --git a/devel/gcc-arm-embedded/files/patch-binutils-gdb_gdbsupport_enum-flags.h b/devel/gcc-arm-embedded/files/patch-binutils-gdb_gdbsupport_enum-flags.h new file mode 100644 index 000000000000..8608c93cea35 --- /dev/null +++ b/devel/gcc-arm-embedded/files/patch-binutils-gdb_gdbsupport_enum-flags.h @@ -0,0 +1,156 @@ +--- binutils-gdb/gdbsupport/enum-flags.h.orig 2024-11-20 17:30:17 UTC ++++ binutils-gdb/gdbsupport/enum-flags.h +@@ -75,30 +75,6 @@ + namespace. The compiler finds the corresponding + is_enum_flags_enum_type function via ADL. */ + +-/* Note that std::underlying_type is not what we want here, +- since that returns unsigned int even when the enum decays to signed +- int. */ +-template class integer_for_size { typedef void type; }; +-template<> struct integer_for_size<1, 0> { typedef uint8_t type; }; +-template<> struct integer_for_size<2, 0> { typedef uint16_t type; }; +-template<> struct integer_for_size<4, 0> { typedef uint32_t type; }; +-template<> struct integer_for_size<8, 0> { typedef uint64_t type; }; +-template<> struct integer_for_size<1, 1> { typedef int8_t type; }; +-template<> struct integer_for_size<2, 1> { typedef int16_t type; }; +-template<> struct integer_for_size<4, 1> { typedef int32_t type; }; +-template<> struct integer_for_size<8, 1> { typedef int64_t type; }; +- +-template +-struct enum_underlying_type +-{ +- DIAGNOSTIC_PUSH +- DIAGNOSTIC_IGNORE_ENUM_CONSTEXPR_CONVERSION +- typedef typename +- integer_for_size(T (-1) < T (0))>::type +- type; +- DIAGNOSTIC_POP +-}; +- + namespace enum_flags_detail + { + +@@ -119,11 +95,62 @@ using EnumIsUnsigned + /* gdb::Requires trait helpers. */ + template + using EnumIsUnsigned +- = std::is_unsigned::type>; ++ = std::is_unsigned::type>; ++ ++/* Helper to detect whether an enum has a fixed underlying type. This can be ++ achieved by using a scoped enum (in which case the type is "int") or ++ an explicit underlying type. C-style enums that are unscoped or do not ++ have an explicit underlying type have an implementation-defined underlying ++ type. ++ ++ https://timsong-cpp.github.io/cppwp/n4659/dcl.enum#5 ++ ++ We need this trait in order to ensure that operator~ below does NOT ++ operate on old-style enums. This is because we apply operator~ on ++ the value and then cast the result to the enum_type. This is however ++ Undefined Behavior if the result does not fit in the range of possible ++ values for the enum. For enums with fixed underlying type, the entire ++ range of the integer is available. However, for old-style enums, the range ++ is only the smallest bit-field that can hold all the values of the ++ enumeration, typically much smaller than the underlying integer: ++ ++ https://timsong-cpp.github.io/cppwp/n4659/expr.static.cast#10 ++ https://timsong-cpp.github.io/cppwp/n4659/dcl.enum#8 ++ ++ To implement this, we leverage the fact that, since C++17, enums with ++ fixed underlying type can be list-initialized from an integer: ++ https://timsong-cpp.github.io/cppwp/n4659/dcl.init.list#3.7 ++ ++ Old-style enums cannot be initialized like that, leading to ill-formed ++ code. ++ ++ We then use this together with SFINAE to create the desired trait. ++ ++*/ ++template ++struct EnumHasFixedUnderlyingType : std::false_type ++{ ++ static_assert(std::is_enum::value); ++}; ++ ++/* Specialization that is active only if enum_type can be ++ list-initialized from an integer (0). Only enums with fixed ++ underlying type satisfy this property in C++17. */ + template +-using EnumIsSigned +- = std::is_signed::type>; ++struct EnumHasFixedUnderlyingType> : std::true_type ++{ ++ static_assert(std::is_enum::value); ++}; + ++template ++using EnumIsSafeForBitwiseComplement = std::conjunction< ++ EnumIsUnsigned, ++ EnumHasFixedUnderlyingType ++>; ++ ++template ++using EnumIsUnsafeForBitwiseComplement = std::negation>; ++ + } + + template +@@ -131,7 +158,7 @@ class enum_flags (public) + { + public: + typedef E enum_type; +- typedef typename enum_underlying_type::type underlying_type; ++ typedef typename std::underlying_type::type underlying_type; + + /* For to_string. Maps one enumerator of E to a string. */ + struct string_mapping +@@ -394,33 +421,41 @@ template , + typename +- = gdb::Requires>> ++ = gdb::Requires>> + constexpr enum_type + operator~ (enum_type e) + { + using underlying = typename enum_flags::underlying_type; +- return (enum_type) ~underlying (e); ++ /* Cast to ULONGEST first, to prevent integer promotions from enums ++ with fixed underlying type std::uint8_t or std::uint16_t to ++ signed int. This ensures we apply the bitwise complement on an ++ unsigned type. */ ++ return (enum_type)(underlying) ~ULONGEST (e); + } + + template , +- typename = gdb::Requires>> ++ typename = gdb::Requires>> + constexpr void operator~ (enum_type e) = delete; + + template , + typename +- = gdb::Requires>> ++ = gdb::Requires>> + constexpr enum_flags + operator~ (enum_flags e) + { + using underlying = typename enum_flags::underlying_type; +- return (enum_type) ~underlying (e); ++ /* Cast to ULONGEST first, to prevent integer promotions from enums ++ with fixed underlying type std::uint8_t or std::uint16_t to ++ signed int. This ensures we apply the bitwise complement on an ++ unsigned type. */ ++ return (enum_type)(underlying) ~ULONGEST (e); + } + + template , +- typename = gdb::Requires>> ++ typename = gdb::Requires>> + constexpr void operator~ (enum_flags e) = delete; + + /* Delete operator<< and operator>>. */ diff --git a/devel/gcc-arm-embedded/files/patch-binutils-gdb_include_diagnostics.h b/devel/gcc-arm-embedded/files/patch-binutils-gdb_include_diagnostics.h new file mode 100644 index 000000000000..6176e26fc03c --- /dev/null +++ b/devel/gcc-arm-embedded/files/patch-binutils-gdb_include_diagnostics.h @@ -0,0 +1,25 @@ +--- binutils-gdb/include/diagnostics.h.orig 2024-11-20 17:30:17 UTC ++++ binutils-gdb/include/diagnostics.h +@@ -76,11 +76,6 @@ + # define DIAGNOSTIC_ERROR_SWITCH \ + DIAGNOSTIC_ERROR ("-Wswitch") + +-# if __has_warning ("-Wenum-constexpr-conversion") +-# define DIAGNOSTIC_IGNORE_ENUM_CONSTEXPR_CONVERSION \ +- DIAGNOSTIC_IGNORE ("-Wenum-constexpr-conversion") +-# endif +- + #elif defined (__GNUC__) /* GCC */ + + # define DIAGNOSTIC_IGNORE_DEPRECATED_DECLARATIONS \ +@@ -157,10 +152,6 @@ + + #ifndef DIAGNOSTIC_ERROR_SWITCH + # define DIAGNOSTIC_ERROR_SWITCH +-#endif +- +-#ifndef DIAGNOSTIC_IGNORE_ENUM_CONSTEXPR_CONVERSION +-# define DIAGNOSTIC_IGNORE_ENUM_CONSTEXPR_CONVERSION + #endif + + #endif /* DIAGNOSTICS_H */