From f233c46ac7b415104d04e4bb74bd7a0fcf24a333 Mon Sep 17 00:00:00 2001
From: Olivier Dion <odion@efficios.com>
Date: Thu, 15 Jun 2023 12:02:08 -0400
Subject: [PATCH] Fix compatibility with glibc 2.35

Something has change with the visibility of the _r_debug structure in
glibc 2.35.  See this issue
<https://github.com/dyninst/dyninst/issues/1282>.

This patch is essentially the upstream fix
<https://github.com/dyninst/dyninst/commit/273803a4c643ed3506f9a69c6ec71d5ab337489c>
backported.

Signed-off-by: Olivier Dion <odion@efficios.com>
---
 dyninstAPI_RT/src/RTlinux.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dyninstAPI_RT/src/RTlinux.c b/dyninstAPI_RT/src/RTlinux.c
index fc231d0a4..2f17ff677 100644
--- a/dyninstAPI_RT/src/RTlinux.c
+++ b/dyninstAPI_RT/src/RTlinux.c
@@ -406,7 +406,6 @@ void dyninstTrapHandler(int sig, siginfo_t *sg, ucontext_t *context)
 #if defined(cap_binary_rewriter)
 
 extern struct r_debug _r_debug;
-DLLEXPORT struct r_debug _r_debug __attribute__ ((weak));
 
 /* Verify that the r_debug variable is visible */
 void r_debugCheck() { assert(_r_debug.r_map); }
-- 
2.40.1

f366b1bcea44'>refs</a><a href='/guix/log/'>log</a><a href='/guix/tree/?id=da3be3ff4f6d8b643ed9bdf6834df366b1bcea44'>tree</a><a class='active' href='/guix/commit/?id=da3be3ff4f6d8b643ed9bdf6834df366b1bcea44'>commit</a><a href='/guix/diff/?id=da3be3ff4f6d8b643ed9bdf6834df366b1bcea44'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/'>
<input type='hidden' name='id' value='da3be3ff4f6d8b643ed9bdf6834df366b1bcea44'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='da3be3ff4f6d8b643ed9bdf6834df366b1bcea44'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Ludovic Courtès &lt;ludo@gnu.org&gt;</td><td class='right'>2022-05-09 14:44:48 +0200</td></tr>
<tr><th>committer</th><td>Ludovic Courtès &lt;ludo@gnu.org&gt;</td><td class='right'>2022-05-09 14:44:48 +0200</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/guix/commit/?id=da3be3ff4f6d8b643ed9bdf6834df366b1bcea44'>da3be3ff4f6d8b643ed9bdf6834df366b1bcea44</a> (<a href='/guix/patch/?id=da3be3ff4f6d8b643ed9bdf6834df366b1bcea44'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/guix/tree/?id=da3be3ff4f6d8b643ed9bdf6834df366b1bcea44'>913ff6010447b6a31dfbe4be6eccc06b11fd83cf</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/guix/commit/?id=f5fe0082abe4547f3fb9f29d8351473cfb3a387b'>f5fe0082abe4547f3fb9f29d8351473cfb3a387b</a> (<a href='/guix/diff/?id=da3be3ff4f6d8b643ed9bdf6834df366b1bcea44&amp;id2=f5fe0082abe4547f3fb9f29d8351473cfb3a387b'>diff</a>)</td></tr><tr><th>parent</th><td colspan='2' class='oid'><a href='/guix/commit/?id=4980630d1e3e6f9a6dc05438c7593a727207d9a0'>4980630d1e3e6f9a6dc05438c7593a727207d9a0</a> (<a href='/guix/diff/?id=da3be3ff4f6d8b643ed9bdf6834df366b1bcea44&amp;id2=4980630d1e3e6f9a6dc05438c7593a727207d9a0'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='oid'><a href='/guix/snapshot/guix-da3be3ff4f6d8b643ed9bdf6834df366b1bcea44.tar.gz'>guix-da3be3ff4f6d8b643ed9bdf6834df366b1bcea44.tar.gz</a><br/><a href='/guix/snapshot/guix-da3be3ff4f6d8b643ed9bdf6834df366b1bcea44.zip'>guix-da3be3ff4f6d8b643ed9bdf6834df366b1bcea44.zip</a><br/></td></tr></table>
<div class='commit-subject'>Merge branch 'master' into staging</div><div class='commit-msg'></div><div class='diffstat-header'><a href='/guix/diff/?id=da3be3ff4f6d8b643ed9bdf6834df366b1bcea44'>Diffstat</a></div><table summary='diffstat' class='diffstat'>