Copied from Debian.

2017-06-14  Florian Weimer  <fweimer@redhat.com>

	* sysdeps/i386/i686/multiarch/strcspn-c.c: Add IS_IN (libc) guard.
	* sysdeps/i386/i686/multiarch/varshift.c: Likewise.

--- a/sysdeps/i386/i686/multiarch/strcspn-c.c
+++ b/sysdeps/i386/i686/multiarch/strcspn-c.c
@@ -1,2 +1,4 @@
-#define __strcspn_sse2 __strcspn_ia32
-#include <sysdeps/x86_64/multiarch/strcspn-c.c>
+#if IS_IN (libc)
+# define __strcspn_sse2 __strcspn_ia32
+# include <sysdeps/x86_64/multiarch/strcspn-c.c>
+#endif
--- a/sysdeps/i386/i686/multiarch/varshift.c
+++ b/sysdeps/i386/i686/multiarch/varshift.c
@@ -1 +1,3 @@
-#include <sysdeps/x86_64/multiarch/varshift.c>
+#if IS_IN (libc)
+# include <sysdeps/x86_64/multiarch/varshift.c>
+#endif
ected='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=2277552a3392624bab334de66f816344ad3c40ac'>refs</a><a class='active' href='/guix/log/gnu/packages/php.scm'>log</a><a href='/guix/tree/gnu/packages/php.scm?id=2277552a3392624bab334de66f816344ad3c40ac'>tree</a><a href='/guix/commit/gnu/packages/php.scm?id=2277552a3392624bab334de66f816344ad3c40ac'>commit</a><a href='/guix/diff/gnu/packages/php.scm?id=2277552a3392624bab334de66f816344ad3c40ac'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/php.scm'>
<input type='hidden' name='id' value='2277552a3392624bab334de66f816344ad3c40ac'/><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=2277552a3392624bab334de66f816344ad3c40ac'>root</a>/<a href='/guix/log/gnu?id=2277552a3392624bab334de66f816344ad3c40ac'>gnu</a>/<a href='/guix/log/gnu/packages?id=2277552a3392624bab334de66f816344ad3c40ac'>packages</a>/<a href='/guix/log/gnu/packages/php.scm?id=2277552a3392624bab334de66f816344ad3c40ac'>php.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/packages/php.scm?id=2277552a3392624bab334de66f816344ad3c40ac&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-06-03 18:23:39 +0200'>2021-06-03</span></td><td><a href='/guix/commit/gnu/packages/php.scm?id=0e8d650c4f578a27b30891751780b75239ffd3f8'>gnu: php: Update to 7.4.20.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-05-06 13:56:26 +0200'>2021-05-06</span></td><td><a href='/guix/commit/gnu/packages/php.scm?id=1ebbf76862b01c92e6d6289612b66599e71ceaf3'>gnu: php: Update to 7.4.19.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-05-01 11:29:11 +0200'>2021-05-01</span></td><td><a href='/guix/commit/gnu/packages/php.scm?id=9b74cfd16140b971d58dc5ae77ef8f8e98c5b47f'>gnu: php: Update to 7.4.18.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-03-05 16:12:31 +0100'>2021-03-05</span></td><td><a href='/guix/commit/gnu/packages/php.scm?id=81aa2fa4ae8fda14dd900ca07559f809ab3354b9'>gnu: php: Update to 7.4.16 [security fixes].</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-02-26 12:57:53 +0100'>2021-02-26</span></td><td><a href='/guix/commit/gnu/packages/php.scm?id=8753bb4192410e6cd81a4072c1dd5f2ff822320e'>gnu: php: Disable failing test on Arm.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-02-09 17:09:49 +0100'>2021-02-09</span></td><td><a href='/guix/commit/gnu/packages/php.scm?id=f2130228ed86fed81806a662ed59aa74ed2398ed'>gnu: php: Disable failing tests on arm.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-02-08 16:36:21 +0100'>2021-02-08</span></td><td><a href='/guix/commit/gnu/packages/php.scm?id=48650b0c3569222d53d29320ba97343dc4ef8038'>gnu: php: Update to 7.4.15.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-01-07 17:18:05 +0100'>2021-01-07</span></td><td><a href='/guix/commit/gnu/packages/php.scm?id=d033540e6c113323089403a26e39f9a288c9c857'>gnu: php: Update to 7.4.14.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>