This is a backport of part of this patch from 6.5 to 4.8:

  https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=8937b94d1a643fd9760714642296d034a45254a8

--- a/libsanitizer/tsan/tsan_platform_linux.cc
+++ b/libsanitizer/tsan/tsan_platform_linux.cc
@@ -351,7 +351,7 @@ bool IsGlobalVar(uptr addr) {
 // closes within glibc. The code is a pure hack.
 int ExtractResolvFDs(void *state, int *fds, int nfd) {
   int cnt = 0;
-  __res_state *statp = (__res_state*)state;
+  struct __res_state *statp = (struct __res_state*)state;
   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
     if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
       fds[cnt++] = statp->_u._ext.nssocks[i];
onchange='this.form.submit();'>
<option value='koszko' selected='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=169c4e612bc0cd498fddd0ffb039aa952cf5e8c0'>refs</a><a class='active' href='/guix/log/gnu/tests/image.scm'>log</a><a href='/guix/tree/gnu/tests/image.scm?id=169c4e612bc0cd498fddd0ffb039aa952cf5e8c0'>tree</a><a href='/guix/commit/gnu/tests/image.scm?id=169c4e612bc0cd498fddd0ffb039aa952cf5e8c0'>commit</a><a href='/guix/diff/gnu/tests/image.scm?id=169c4e612bc0cd498fddd0ffb039aa952cf5e8c0'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/tests/image.scm'>
<input type='hidden' name='id' value='169c4e612bc0cd498fddd0ffb039aa952cf5e8c0'/><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='path'>path: <a href='/guix/log/?id=169c4e612bc0cd498fddd0ffb039aa952cf5e8c0'>root</a>/<a href='/guix/log/gnu?id=169c4e612bc0cd498fddd0ffb039aa952cf5e8c0'>gnu</a>/<a href='/guix/log/gnu/tests?id=169c4e612bc0cd498fddd0ffb039aa952cf5e8c0'>tests</a>/<a href='/guix/log/gnu/tests/image.scm?id=169c4e612bc0cd498fddd0ffb039aa952cf5e8c0'>image.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/tests/image.scm?id=169c4e612bc0cd498fddd0ffb039aa952cf5e8c0&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-07-07 21:14:10 +0200'>2023-07-07</span></td><td><a href='/guix/commit/gnu/tests/image.scm?id=209204e23b39af09e0ea92540b6fa00a60e6a0ae'>image: Prefer gpt partition table for efi images</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/system/image.scm (efi-disk-image): Use gpt partition-table-type.
(efi32-disk-image): Use gpt partition-table-type.
(qcow2-image-type): Use mbr partition-table-type explicitly.
* gnu/tests/image.scm: Assert partition table type of efi-disk-image.

Signed-off-by: Josselin Poiret &lt;dev@jpoiret.xyz&gt;
</span></span></td><td>Sergey Trofimov</td></tr>
<tr><td><span title='2022-08-30 19:29:58 +0200'>2022-08-30</span></td><td><a href='/guix/commit/gnu/tests/image.scm?id=73fb14c28ae883b6bd22ffdc63d1d59752cb8e0e'>tests: image: New test.</a><span class='msg-avail'>...<span class='msg-tooltip'>Add a new image test module to validate the image creation itself. The images
structures are validated using guile-parted. Checking the content of those
images is out of scope and should be performed in other modules (installation
for instance).

* gnu/tests/image.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
</span></span></td><td>Mathieu Othacehe</td></tr>