Projects
home:yy:branches:Mega-LLVM:24.03
crash
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Difference Between Revision 5 and
Mega-LLVM:24.03
/
crash
View file
_service:tar_scm:crash.spec
Changed
@@ -1,6 +1,6 @@ Name: crash Version: 8.0.4 -Release: 1 +Release: 4 Summary: Linux kernel crash utility. License: GPLv3 URL: https://crash-utility.github.io @@ -9,12 +9,9 @@ Patch0: 0000-lzo_snappy.patch Patch1: 0001-add-SDEI-stack-resolution.patch -%ifarch sw_64 Patch2: 0002-crash-8.0.2-sw.patch -%endif -%ifarch loongarch64 -Patch3: 0003-crash-add-loongarch-support.patch -%endif +Patch3: 0003-crash-8.0.4-add-support-for-loongarch64.patch +Patch4; 0004-gdbsupport-ignore-Wenum-constexpr-conversion-in-enum.patch BuildRequires: ncurses-devel zlib-devel lzo-devel snappy-devel texinfo libzstd-devel BuildRequires: gcc gcc-c++ bison m4 @@ -45,7 +42,15 @@ %package_help %prep -%autosetup -n %{name}-%{version} -p1 +%setup -q -n %{name}-%{version} +%patch0 -p1 +%patch1 -p1 +%ifarch sw_64 +%patch2 -p1 +%endif +%ifarch loongarch64 +%patch3 -p1 +%endif %build cp %{SOURCE1} . @@ -80,6 +85,16 @@ %{_mandir}/man8/crash.8* %changelog +* * Sat Jul 27 2024 yanying <201250106@smail.nju.edu.cn> - 8.0.4-4 +- Backport gdbsupport ignore Wenum-constexpr-conversion in enum + +* Tue May 28 2024 shaojiansong <shaojiansong@kylinos.cn> - 8.0.4-3 +- Fix lack of loongarch64 and sw_64 patch files in src.rpm package which is build from any platform. + +* Tue Apr 16 2024 Pengda Dou <doupengda@loongson.cn> - 8.0.4-2 +- Resolve loongarch64 patch add error +- add support for loongarch64 + * Thu Jan 25 2024 chenhaixiang<chenhaixiang3@huawei.com> - 8.0.4-1 - Upgrade to crash-8.0.4
View file
_service:tar_scm:0003-crash-8.0.4-add-support-for-loongarch64.patch
Added
@@ -0,0 +1,17381 @@ +From 0630f9aac4a41f14d1f30862ae41dd28aeb61d0e Mon Sep 17 00:00:00 2001 +From: doupengda <doupengda@loongson.cn> +Date: Tue, 16 Apr 2024 01:44:30 +0000 +Subject: PATCH crash 8.0.4 add support for loongarch64 + +--- + .rh_rpm_package | 1 - + Makefile | 26 +- + README | 2 +- + configure.c | 28 +- + crash.8 | 2 +- + defs.h | 162 +- + diskdump.c | 22 +- + gdb-10.2-loongarch.patch | 15207 +++++++++++++++++++++++++++++++++++++ + help.c | 2 +- + lkcd_vmdump_v1.h | 2 +- + lkcd_vmdump_v2_v3.h | 4 +- + loongarch64.c | 1347 ++++ + main.c | 3 +- + netdump.c | 26 +- + ramdump.c | 2 + + symbols.c | 23 +- + 16 files changed, 16831 insertions(+), 28 deletions(-) + delete mode 100644 .rh_rpm_package + create mode 100644 gdb-10.2-loongarch.patch + create mode 100644 loongarch64.c + +diff --git a/.rh_rpm_package b/.rh_rpm_package +deleted file mode 100644 +index 50c496d..0000000 +--- a/.rh_rpm_package ++++ /dev/null +@@ -1 +0,0 @@ +-8.0.4 +diff --git a/Makefile b/Makefile +index 6f94f25..83cff8f 100644 +--- a/Makefile ++++ b/Makefile +@@ -24,7 +24,7 @@ PROGRAM=crash + # Supported targets: X86 ALPHA PPC IA64 PPC64 SPARC64 + # TARGET and GDB_CONF_FLAGS will be configured automatically by configure + # +-TARGET= ++TARGET=LOONGARCH64 + GDB_CONF_FLAGS= + + ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/) +@@ -35,10 +35,10 @@ endif + # + # GDB, GDB_FILES, GDB_OFILES and GDB_PATCH_FILES will be configured automatically by configure + # +-GDB= +-GDB_FILES= +-GDB_OFILES= +-GDB_PATCH_FILES= ++GDB=gdb-10.2 ++GDB_FILES=${GDB_10.2_FILES} ++GDB_OFILES=${GDB_10.2_OFILES} ++GDB_PATCH_FILES=gdb-10.2.patch + + # + # Default installation directory +@@ -65,7 +65,7 @@ CFILES=main.c tools.c global_data.c memory.c filesys.c help.c task.c \ + kernel.c test.c gdb_interface.c configure.c net.c dev.c bpf.c \ + printk.c \ + alpha.c x86.c ppc.c ia64.c s390.c s390x.c s390dbf.c ppc64.c x86_64.c \ +- arm.c arm64.c mips.c mips64.c riscv64.c sparc64.c \ ++ arm.c arm64.c mips.c mips64.c riscv64.c sparc64.c loongarch64.c \ + extensions.c remote.c va_server.c va_server_v1.c symbols.c cmdline.c \ + lkcd_common.c lkcd_v1.c lkcd_v2_v3.c lkcd_v5.c lkcd_v7.c lkcd_v8.c\ + lkcd_fix_mem.c s390_dump.c lkcd_x86_trace.c \ +@@ -85,7 +85,7 @@ OBJECT_FILES=main.o tools.o global_data.o memory.o filesys.o help.o task.o \ + build_data.o kernel.o test.o gdb_interface.o net.o dev.o bpf.o \ + printk.o \ + alpha.o x86.o ppc.o ia64.o s390.o s390x.o s390dbf.o ppc64.o x86_64.o \ +- arm.o arm64.o mips.o mips64.o riscv64.o sparc64.o \ ++ arm.o arm64.o mips.o mips64.o riscv64.o sparc64.o loongarch64.o \ + extensions.o remote.o va_server.o va_server_v1.o symbols.o cmdline.o \ + lkcd_common.o lkcd_v1.o lkcd_v2_v3.o lkcd_v5.o lkcd_v7.o lkcd_v8.o \ + lkcd_fix_mem.o s390_dump.o netdump.o diskdump.o makedumpfile.o xendump.o \ +@@ -190,7 +190,7 @@ GDB_10.2_OFILES=${GDB}/gdb/symtab.o crash_target.o + # + # GDB_FLAGS is passed up from the gdb Makefile. + # +-GDB_FLAGS= ++GDB_FLAGS=-DGDB_10_2 + + # + # WARNING_OPTIONS and WARNING_ERROR are both applied on a per-file basis. +@@ -207,7 +207,7 @@ TARGET_CFLAGS= + + CRASH_CFLAGS=-g -D${TARGET} ${TARGET_CFLAGS} ${GDB_FLAGS} ${CFLAGS} + +-GPL_FILES= ++GPL_FILES=COPYING3 + TAR_FILES=${SOURCE_FILES} Makefile ${GPL_FILES} README .rh_rpm_package crash.8 \ + ${EXTENSION_SOURCE_FILES} ${MEMORY_DRIVER_FILES} + CSCOPE_FILES=${SOURCE_FILES} +@@ -292,7 +292,9 @@ gdb_unzip: + + gdb_patch: + if -f ${GDB}.patch && -s ${GDB}.patch ; then \ +- patch -p0 < ${GDB}.patch; cp ${GDB}.patch ${GDB}; fi ++ patch -p0 < ${GDB}.patch; cp ${GDB}.patch ${GDB}; fi ++ if -f ${GDB}-loongarch.patch && -s ${GDB}-loongarch.patch ; then \ ++ patch -p0 < ${GDB}-loongarch.patch; cp ${GDB}-loongarch.patch ${GDB}; fi + + library: ${OBJECT_FILES} + ar -rs ${PROGRAM}lib.a ${OBJECT_FILES} +@@ -445,6 +447,10 @@ riscv64.o: ${GENERIC_HFILES} ${REDHAT_HFILES} riscv64.c + sparc64.o: ${GENERIC_HFILES} ${REDHAT_HFILES} sparc64.c + ${CC} -c ${CRASH_CFLAGS} sparc64.c ${WARNING_OPTIONS} ${WARNING_ERROR} + ++loongarch64.o: ${GENERIC_HFILES} ${REDHAT_HFILES} loongarch64.c ++ ${CC} -c ${CRASH_CFLAGS} loongarch64.c ${WARNING_OPTIONS} ${WARNING_ERROR} ++ ++ + s390.o: ${GENERIC_HFILES} ${IBM_HFILES} s390.c + ${CC} -c ${CRASH_CFLAGS} s390.c ${WARNING_OPTIONS} ${WARNING_ERROR} + +diff --git a/README b/README +index 6ecdd10..4392712 100644 +--- a/README ++++ b/README +@@ -37,7 +37,7 @@ + These are the current prerequisites: + + o At this point, x86, ia64, x86_64, ppc64, ppc, arm, arm64, alpha, mips, +- mips64, riscv64, s390 and s390x-based kernels are supported. Other ++ mips64, riscv64, loongarch64, s390 and s390x-based kernels are supported. Other + architectures may be addressed in the future. + + o One size fits all -- the utility can be run on any Linux kernel version +diff --git a/configure.c b/configure.c +index 08b52be..a6895ec 100644 +--- a/configure.c ++++ b/configure.c +@@ -108,6 +108,7 @@ void add_extra_lib(char *); + #undef SPARC64 + #undef MIPS64 + #undef RISCV64 ++#undef LOONGARCH64 + + #define UNKNOWN 0 + #define X86 1 +@@ -124,6 +125,7 @@ void add_extra_lib(char *); + #define SPARC64 12 + #define MIPS64 13 + #define RISCV64 14 ++#define LOONGARCH64 15 + + #define TARGET_X86 "TARGET=X86" + #define TARGET_ALPHA "TARGET=ALPHA" +@@ -139,6 +141,7 @@ void add_extra_lib(char *); + #define TARGET_MIPS64 "TARGET=MIPS64" + #define TARGET_SPARC64 "TARGET=SPARC64" + #define TARGET_RISCV64 "TARGET=RISCV64" ++#define TARGET_LOONGARCH64 "TARGET=LOONGARCH64" + + #define TARGET_CFLAGS_X86 "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" + #define TARGET_CFLAGS_ALPHA "TARGET_CFLAGS=" +@@ -163,6 +166,7 @@ void add_extra_lib(char *); + #define TARGET_CFLAGS_SPARC64 "TARGET_CFLAGS=" + #define TARGET_CFLAGS_RISCV64 "TARGET_CFLAGS=" + #define TARGET_CFLAGS_RISCV64_ON_X86_64 "TARGET_CFLAGS=" ++#define TARGET_CFLAGS_LOONGARCH64 "TARGET_CFLAGS=" + + #define GDB_TARGET_DEFAULT "GDB_CONF_FLAGS=" + #define GDB_TARGET_ARM_ON_X86 "GDB_CONF_FLAGS=--target=arm-elf-linux" +@@ -413,6 +417,9 @@ get_current_configuration(struct supported_gdb_version *sp) + #if defined(__riscv) && (__riscv_xlen == 64) + target_data.target = RISCV64; + #endif ++#ifdef __loongarch64 ++ target_data.target = LOONGARCH64; ++#endif + + set_initial_target(sp); + +@@ -472,7 +479,10 @@ get_current_configuration(struct supported_gdb_version *sp) + * Build an RISCV64 crash binary on an X86_64 host. + */ + target_data.target = RISCV64; +- } else { ++ } else if ((target_data.initial_gdb_target == LOONGARCH64) && ++ (target_data.target != LOONGARCH64)) { ++ arch_mismatch(sp); ++ } else { + fprintf(stderr, + "\ntarget=%s is not supported on the %s host architecture\n\n", + target_data.target_as_param, +@@ -686,6 +696,9 @@ show_configuration(void) + case RISCV64: + printf("TARGET: RISCV64\n"); + break; ++ case LOONGARCH64: ++ printf("TARGET: LOONGARCH64\n"); ++ break; + }
View file
_service:tar_scm:0003-crash-add-loongarch-support.patch
Deleted
@@ -1,17364 +0,0 @@ -From b9e0a25e29a897161360a44b1c206368f7d99310 Mon Sep 17 00:00:00 2001 -From: Ming Wang <wangming01@loongson.cn> -Date: Mon, 10 Jul 2023 14:04:37 +0800 -Subject: PATCH crash: add loongarch support. - -Signed-off-by: Ming Wang <wangming01@loongson.cn> ---- - Makefile | 9 +- - README | 4 +- - configure.c | 27 +- - crash.8 | 2 +- - defs.h | 160 +- - diskdump.c | 26 +- - gdb-10.2-loongarch.patch | 15207 +++++++++++++++++++++++++++++++++++++ - gdb_interface.c | 1 - - help.c | 9 +- - lkcd_vmdump_v1.h | 2 + - lkcd_vmdump_v2_v3.h | 4 +- - loongarch64.c | 1347 ++++ - main.c | 3 +- - netdump.c | 28 +- - ramdump.c | 2 + - symbols.c | 26 +- - 16 files changed, 16836 insertions(+), 21 deletions(-) - create mode 100644 gdb-10.2-loongarch.patch - create mode 100644 loongarch64.c - -diff --git a/Makefile b/Makefile -index 79aef17..d26d2e2 100644 ---- a/Makefile -+++ b/Makefile -@@ -64,7 +64,7 @@ CFILES=main.c tools.c global_data.c memory.c filesys.c help.c task.c \ - kernel.c test.c gdb_interface.c configure.c net.c dev.c bpf.c \ - printk.c \ - alpha.c x86.c ppc.c ia64.c s390.c s390x.c s390dbf.c ppc64.c x86_64.c \ -- arm.c arm64.c mips.c mips64.c sparc64.c \ -+ arm.c arm64.c mips.c mips64.c sparc64.c loongarch64.c\ - extensions.c remote.c va_server.c va_server_v1.c symbols.c cmdline.c \ - lkcd_common.c lkcd_v1.c lkcd_v2_v3.c lkcd_v5.c lkcd_v7.c lkcd_v8.c\ - lkcd_fix_mem.c s390_dump.c lkcd_x86_trace.c \ -@@ -84,7 +84,7 @@ OBJECT_FILES=main.o tools.o global_data.o memory.o filesys.o help.o task.o \ - build_data.o kernel.o test.o gdb_interface.o net.o dev.o bpf.o \ - printk.o \ - alpha.o x86.o ppc.o ia64.o s390.o s390x.o s390dbf.o ppc64.o x86_64.o \ -- arm.o arm64.o mips.o mips64.o sparc64.o \ -+ arm.o arm64.o mips.o mips64.o sparc64.o loongarch64.o\ - extensions.o remote.o va_server.o va_server_v1.o symbols.o cmdline.o \ - lkcd_common.o lkcd_v1.o lkcd_v2_v3.o lkcd_v5.o lkcd_v7.o lkcd_v8.o \ - lkcd_fix_mem.o s390_dump.o netdump.o diskdump.o makedumpfile.o xendump.o \ -@@ -292,6 +292,8 @@ gdb_unzip: - gdb_patch: - if -f ${GDB}.patch && -s ${GDB}.patch ; then \ - patch -p0 < ${GDB}.patch; cp ${GDB}.patch ${GDB}; fi -+ if -f ${GDB}-loongarch.patch && -s ${GDB}-loongarch.patch ; then \ -+ patch -p0 < ${GDB}-loongarch.patch; cp ${GDB}-loongarch.patch ${GDB}; fi - - library: ${OBJECT_FILES} - ar -rs ${PROGRAM}lib.a ${OBJECT_FILES} -@@ -441,6 +443,9 @@ mips64.o: ${GENERIC_HFILES} ${REDHAT_HFILES} mips64.c - sparc64.o: ${GENERIC_HFILES} ${REDHAT_HFILES} sparc64.c - ${CC} -c ${CRASH_CFLAGS} sparc64.c ${WARNING_OPTIONS} ${WARNING_ERROR} - -+loongarch64.o: ${GENERIC_HFILES} ${REDHAT_HFILES} loongarch64.c -+ ${CC} -c ${CRASH_CFLAGS} loongarch64.c ${WARNING_OPTIONS} ${WARNING_ERROR} -+ - s390.o: ${GENERIC_HFILES} ${IBM_HFILES} s390.c - ${CC} -c ${CRASH_CFLAGS} s390.c ${WARNING_OPTIONS} ${WARNING_ERROR} - -diff --git a/README b/README -index 1f98fbf..de3bdf9 100644 ---- a/README -+++ b/README -@@ -37,8 +37,8 @@ - These are the current prerequisites: - - o At this point, x86, ia64, x86_64, ppc64, ppc, arm, arm64, alpha, mips, -- mips64, s390 and s390x-based kernels are supported. Other architectures -- may be addressed in the future. -+ mips64, loongarch64, s390 and s390x-based kernels are supported. Other -+ architectures may be addressed in the future. - - o One size fits all -- the utility can be run on any Linux kernel version - version dating back to 2.2.5-15. A primary design goal is to always -diff --git a/configure.c b/configure.c -index 5188851..9d038f5 100644 ---- a/configure.c -+++ b/configure.c -@@ -107,6 +107,7 @@ void add_extra_lib(char *); - #undef MIPS - #undef SPARC64 - #undef MIPS64 -+#undef LOONGARCH64 - - #define UNKNOWN 0 - #define X86 1 -@@ -122,6 +123,7 @@ void add_extra_lib(char *); - #define MIPS 11 - #define SPARC64 12 - #define MIPS64 13 -+#define LOONGARCH64 14 - - #define TARGET_X86 "TARGET=X86" - #define TARGET_ALPHA "TARGET=ALPHA" -@@ -136,6 +138,7 @@ void add_extra_lib(char *); - #define TARGET_MIPS "TARGET=MIPS" - #define TARGET_MIPS64 "TARGET=MIPS64" - #define TARGET_SPARC64 "TARGET=SPARC64" -+#define TARGET_LOONGARCH64 "TARGET=LOONGARCH64" - - #define TARGET_CFLAGS_X86 "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" - #define TARGET_CFLAGS_ALPHA "TARGET_CFLAGS=" -@@ -158,6 +161,7 @@ void add_extra_lib(char *); - #define TARGET_CFLAGS_MIPS_ON_X86_64 "TARGET_CFLAGS=-m32 -D_FILE_OFFSET_BITS=64" - #define TARGET_CFLAGS_MIPS64 "TARGET_CFLAGS=" - #define TARGET_CFLAGS_SPARC64 "TARGET_CFLAGS=" -+#define TARGET_CFLAGS_LOONGARCH64 "TARGET_CFLAGS=" - - #define GDB_TARGET_DEFAULT "GDB_CONF_FLAGS=" - #define GDB_TARGET_ARM_ON_X86 "GDB_CONF_FLAGS=--target=arm-elf-linux" -@@ -404,6 +408,9 @@ get_current_configuration(struct supported_gdb_version *sp) - #ifdef __sparc_v9__ - target_data.target = SPARC64; - #endif -+#ifdef __loongarch64 -+ target_data.target = LOONGARCH64; -+#endif - - set_initial_target(sp); - -@@ -497,6 +504,10 @@ get_current_configuration(struct supported_gdb_version *sp) - (target_data.target != MIPS64)) - arch_mismatch(sp); - -+ if ((target_data.initial_gdb_target == LOONGARCH64) && -+ (target_data.target != LOONGARCH64)) -+ arch_mismatch(sp); -+ - if ((target_data.initial_gdb_target == X86) && - (target_data.target != X86)) { - if (target_data.target == X86_64) -@@ -660,6 +671,9 @@ show_configuration(void) - case SPARC64: - printf("TARGET: SPARC64\n"); - break; -+ case LOONGARCH64: -+ printf("TARGET: LOONGARCH64\n"); -+ break; - } - - if (strlen(target_data.program)) { -@@ -777,6 +791,10 @@ build_configure(struct supported_gdb_version *sp) - target = TARGET_SPARC64; - target_CFLAGS = TARGET_CFLAGS_SPARC64; - break; -+ case LOONGARCH64: -+ target = TARGET_LOONGARCH64; -+ target_CFLAGS = TARGET_CFLAGS_LOONGARCH64; -+ break; - } - - ldflags = get_extra_flags("LDFLAGS.extra", NULL); -@@ -1374,7 +1392,7 @@ make_spec_file(struct supported_gdb_version *sp) - printf("Vendor: Red Hat, Inc.\n"); - printf("Packager: Dave Anderson <anderson@redhat.com>\n"); - printf("ExclusiveOS: Linux\n"); -- printf("ExclusiveArch: %%{ix86} alpha ia64 ppc ppc64 ppc64pseries ppc64iseries x86_64 s390 s390x arm aarch64 ppc64le mips mipsel mips64el sparc64\n"); -+ printf("ExclusiveArch: %%{ix86} alpha ia64 ppc ppc64 ppc64pseries ppc64iseries x86_64 s390 s390x arm aarch64 ppc64le mips mipsel mips64el sparc64 loongarch64\n"); - printf("Buildroot: %%{_tmppath}/%%{name}-root\n"); - printf("BuildRequires: ncurses-devel zlib-devel bison\n"); - printf("Requires: binutils\n"); -@@ -1613,6 +1631,8 @@ set_initial_target(struct supported_gdb_version *sp) - target_data.initial_gdb_target = MIPS; - else if (strncmp(buf, "SPARC64", strlen("SPARC64")) == 0) - target_data.initial_gdb_target = SPARC64; -+ else if (strncmp(buf, "LOONGARCH64", strlen("LOONGARCH64")) == 0) -+ target_data.initial_gdb_target = LOONGARCH64; - } - - char * -@@ -1633,6 +1653,7 @@ target_to_name(int target) - case MIPS: return("MIPS"); - case MIPS64: return("MIPS64"); - case SPARC64: return("SPARC64"); -+ case LOONGARCH64: return("LOONGARCH64"); - } - - return "UNKNOWN"; -@@ -1697,6 +1718,10 @@ name_to_target(char *name) - return MIPS64; - else if (strncmp(name, "sparc64", strlen("sparc64")) == 0) - return SPARC64; -+ else if (strncmp(name, "loongarch64", strlen("loongarch64")) == 0) -+ return LOONGARCH64; -+ else if (strncmp(name, "LOONGARCH64", strlen("LOONGARCH64")) == 0) -+ return LOONGARCH64; - - return UNKNOWN; - } -diff --git a/crash.8 b/crash.8
View file
_service:tar_scm:0004-gdbsupport-ignore-Wenum-constexpr-conversion-in-enum.patch
Added
@@ -0,0 +1,160 @@ +From 8cbde735e40551a694d4ee5cfd4d525d3d77ff7e Mon Sep 17 00:00:00 2001 +From: Simon Marchi <simon.marchi@efficios.com> +Date: Thu, 23 Feb 2023 12:35:40 -0500 +Subject: PATCH gdbsupport: ignore -Wenum-constexpr-conversion in + enum-flags.h + +When building with clang 16, we get: + + CXX gdb.o + In file included from /home/smarchi/src/binutils-gdb/gdb/gdb.c:19: + In file included from /home/smarchi/src/binutils-gdb/gdb/defs.h:65: + /home/smarchi/src/binutils-gdb/gdb/../gdbsupport/enum-flags.h:95:52: error: integer value -1 is outside the valid range of values 0, 15 for this enumeration type -Wenum-constexpr-conversion + integer_for_size<sizeof (T), static_cast<bool>(T (-1) < T (0))>::type + ^ + +The error message does not make it clear in the context of which enum +flag this fails (i.e. what is T in this context), but it doesn't really +matter, we have similar warning/errors for many of them, if we let the +build go through. + +clang is right that the value -1 is invalid for the enum type we cast -1 +to. However, we do need this expression in order to select an integer +type with the appropriate signedness. That is, with the same signedness +as the underlying type of the enum. + +I first wondered if that was really needed, if we couldn't use +std::underlying_type for that. It turns out that the comment just above +says: + + /* Note that std::underlying_type<enum_type> is not what we want here, + since that returns unsigned int even when the enum decays to signed + int. */ + +I was surprised, because std::is_signed<std::underlying_type<enum_type>> +returns the right thing. So I tried replacing all this with +std::underlying_type, see if that would work. Doing so causes some +build failures in unittests/enum-flags-selftests.c: + + CXX unittests/enum-flags-selftests.o + /home/smarchi/src/binutils-gdb/gdb/unittests/enum-flags-selftests.c:254:1: error: static assertion failed due to requirement 'gdb::is_same<selftests::enum_flags_tests::check_valid_expr254::archetype<enum_flags<s + elftests::enum_flags_tests::RE>, selftests::enum_flags_tests::RE, enum_flags<selftests::enum_flags_tests::RE2>, selftests::enum_flags_tests::RE2, enum_flags<selftests::enum_flags_tests::URE>, selftests::enum_fla + gs_tests::URE, int>, selftests::enum_flags_tests::check_valid_expr254::archetype<enum_flags<selftests::enum_flags_tests::RE>, selftests::enum_flags_tests::RE, enum_flags<selftests::enum_flags_tests::RE2>, selfte + sts::enum_flags_tests::RE2, enum_flags<selftests::enum_flags_tests::URE>, selftests::enum_flags_tests::URE, unsigned int>>::value == true': + CHECK_VALID (true, int, true ? EF () : EF2 ()) + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + /home/smarchi/src/binutils-gdb/gdb/unittests/enum-flags-selftests.c:91:3: note: expanded from macro 'CHECK_VALID' + CHECK_VALID_EXPR_6 (EF, RE, EF2, RE2, UEF, URE, VALID, EXPR_TYPE, EXPR) + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + /home/smarchi/src/binutils-gdb/gdb/../gdbsupport/valid-expr.h:105:3: note: expanded from macro 'CHECK_VALID_EXPR_6' + CHECK_VALID_EXPR_INT (ESC_PARENS (typename T1, typename T2, \ + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + /home/smarchi/src/binutils-gdb/gdb/../gdbsupport/valid-expr.h:66:3: note: expanded from macro 'CHECK_VALID_EXPR_INT' + static_assert (gdb::is_detected_exact<archetype<TYPES, EXPR_TYPE>, \ + ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +This is a bit hard to decode, but basically enumerations have the +following funny property that they decay into a signed int, even if +their implicit underlying type is unsigned. This code: + + enum A {}; + enum B {}; + + int main() { + std::cout << std::is_signed<std::underlying_type<A>::type>::value + << std::endl; + std::cout << std::is_signed<std::underlying_type<B>::type>::value + << std::endl; + auto result = true ? A() : B(); + std::cout << std::is_signed<decltype(result)>::value << std::endl; + } + +produces: + + 0 + 0 + 1 + +So, the "CHECK_VALID" above checks that this property works for enum flags the +same way as it would if you were using their underlying enum types. And +somehow, changing integer_for_size to use std::underlying_type breaks that. + +Since the current code does what we want, and I don't see any way of doing it +differently, ignore -Wenum-constexpr-conversion around it. + +Change-Id: Ibc82ae7bbdb812102ae3f1dd099fc859dc6f3cc2 +--- + gdbsupport/enum-flags.h | 3 +++ + include/diagnostics.h | 34 ++++++++++++++++++++++++++++++++++ + 2 files changed, 37 insertions(+) + +diff --git a/gdbsupport/enum-flags.h b/gdbsupport/enum-flags.h +index 9066ea6bd32..8926a779e83 100644 +--- a/gdbsupport/enum-flags.h ++++ b/gdbsupport/enum-flags.h +@@ -81,9 +81,12 @@ template<> struct integer_for_size<8, 1> { typedef int64_t type; }; + template<typename T> + struct enum_underlying_type + { ++ DIAGNOSTIC_PUSH ++ DIAGNOSTIC_IGNORE_ENUM_CONSTEXPR_CONVERSION + typedef typename + integer_for_size<sizeof (T), static_cast<bool>(T (-1) < T (0))>::type + type; ++ DIAGNOSTIC_POP + }; + + template <typename E> +diff --git a/include/diagnostics.h b/include/diagnostics.h +index 0f0a33c1a1e..c3d3ab9852c 100644 +--- a/include/diagnostics.h ++++ b/include/diagnostics.h +@@ -61,6 +61,24 @@ + # define DIAGNOSTIC_IGNORE_FORMAT_NONLITERAL \ + DIAGNOSTIC_IGNORE ("-Wformat-nonliteral") + ++# if __has_warning ("-Wuser-defined-warnings") ++# define DIAGNOSTIC_IGNORE_USER_DEFINED_WARNINGS \ ++ DIAGNOSTIC_IGNORE ("-Wuser-defined-warnings") ++# endif ++ ++# if __has_warning ("-Wunused-but-set-variable") ++# define DIAGNOSTIC_IGNORE_UNUSED_BUT_SET_VARIABLE \ ++ DIAGNOSTIC_IGNORE ("-Wunused-but-set-variable") ++# endif ++ ++# 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 */ + + # if __GNUC__ >= 7 +@@ -100,4 +118,20 @@ + # define DIAGNOSTIC_IGNORE_FORMAT_NONLITERAL + #endif + ++#ifndef DIAGNOSTIC_IGNORE_USER_DEFINED_WARNINGS ++# define DIAGNOSTIC_IGNORE_USER_DEFINED_WARNINGS ++#endif ++ ++#ifndef DIAGNOSTIC_IGNORE_UNUSED_BUT_SET_VARIABLE ++# define DIAGNOSTIC_IGNORE_UNUSED_BUT_SET_VARIABLE ++#endif ++ ++#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 */ +-- +2.41.0.windows.1 +
View file
_service
Changed
@@ -1,8 +1,8 @@ <services> <service name="tar_scm"> <param name="scm">git</param> - <param name="url">git@gitee.com:src-openeuler/crash.git</param> - <param name="revision">openEuler-24.03-LTS</param> + <param name="url">git@gitee.com:yanyir/crash.git</param> + <param name="revision">openEuler-24.03-LTS-yy</param> <param name="exclude">*</param> <param name="extract">*</param> </service>
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2