diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2020-10-31 10:16:16 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2020-10-31 10:16:28 +0000 |
| commit | 9444dcb0033689a493c681a8f5ce5660bc143df8 (patch) | |
| tree | de0f11b9a9d1cb740d06ce27f9688fe9e634ed66 /dev-util/edb-debugger | |
| parent | sys-libs/glibc: 2.31-7 stable for amd64 (diff) | |
| download | gentoo-9444dcb0033689a493c681a8f5ce5660bc143df8.tar.gz gentoo-9444dcb0033689a493c681a8f5ce5660bc143df8.tar.bz2 gentoo-9444dcb0033689a493c681a8f5ce5660bc143df8.zip | |
dev-util/edb-debugger: backport gcc-11 fix
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'dev-util/edb-debugger')
| -rw-r--r-- | dev-util/edb-debugger/edb-debugger-1.2.0.ebuild | 5 | ||||
| -rw-r--r-- | dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch | 48 |
2 files changed, 52 insertions, 1 deletions
diff --git a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild index 9fd3eb915ec0..4d27f38f9869 100644 --- a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild +++ b/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild @@ -34,7 +34,10 @@ DEPEND=" ${RDEPEND} " -PATCHES=("${FILESDIR}"/${PN}-1.2.0-qt-5.15.patch) +PATCHES=( + "${FILESDIR}"/${PN}-1.2.0-qt-5.15.patch + "${FILESDIR}"/${PN}-1.2.0-gcc-11.patch +) S=${WORKDIR}/${PN} diff --git a/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch b/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch new file mode 100644 index 000000000000..68d58b2b90eb --- /dev/null +++ b/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch @@ -0,0 +1,48 @@ +https://github.com/eteran/edb-debugger/pull/776 + +From a46587a77c33256d56077a2d0709291b3ab12505 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Fri, 11 Sep 2020 07:57:39 +0100 +Subject: [PATCH] x86-generic/PlatformThread.cpp: avoid non-constant offsetof + +On gcc-11 edb-debugger build fails as: + +``` +.../x86-generic/PlatformThread.cpp:332:79: error: 'n' is not a constant expression + 332 | return ptrace(PTRACE_POKEUSER, tid_, offsetof(struct user, u_debugreg[n]), value); + | ^ +``` + +The change workarounds by avoiding non-constant expression: +https://gcc.gnu.org/PR95942 + +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +--- + .../unix/linux/arch/x86-generic/PlatformThread.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp ++++ b/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp +@@ -318,7 +318,8 @@ edb::address_t PlatformThread::instructionPointer() const { + * @return + */ + unsigned long PlatformThread::getDebugRegister(std::size_t n) { +- return ptrace(PTRACE_PEEKUSER, tid_, offsetof(struct user, u_debugreg[n]), 0); ++ size_t drOffset = offsetof(struct user, u_debugreg[0]) + n * sizeof(user::u_debugreg[0]); ++ return ptrace(PTRACE_PEEKUSER, tid_, drOffset, 0); + } + + /** +@@ -328,7 +329,8 @@ unsigned long PlatformThread::getDebugRegister(std::size_t n) { + * @return + */ + long PlatformThread::setDebugRegister(std::size_t n, unsigned long value) { +- return ptrace(PTRACE_POKEUSER, tid_, offsetof(struct user, u_debugreg[n]), value); ++ size_t drOffset = offsetof(struct user, u_debugreg[0]) + n * sizeof(user::u_debugreg[0]); ++ return ptrace(PTRACE_POKEUSER, tid_, drOffset, value); + } + + /** +-- +2.28.0 + |