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
zko' 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=3211f45f0b741d5dea97de3745804881d7446d34'>refs</a><a class='active' href='/guix/log/gnu/packages/dejagnu.scm'>log</a><a href='/guix/tree/gnu/packages/dejagnu.scm?id=3211f45f0b741d5dea97de3745804881d7446d34'>tree</a><a href='/guix/commit/gnu/packages/dejagnu.scm?id=3211f45f0b741d5dea97de3745804881d7446d34'>commit</a><a href='/guix/diff/gnu/packages/dejagnu.scm?id=3211f45f0b741d5dea97de3745804881d7446d34'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/dejagnu.scm'>
<input type='hidden' name='id' value='3211f45f0b741d5dea97de3745804881d7446d34'/><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=3211f45f0b741d5dea97de3745804881d7446d34'>root</a>/<a href='/guix/log/gnu?id=3211f45f0b741d5dea97de3745804881d7446d34'>gnu</a>/<a href='/guix/log/gnu/packages?id=3211f45f0b741d5dea97de3745804881d7446d34'>packages</a>/<a href='/guix/log/gnu/packages/dejagnu.scm?id=3211f45f0b741d5dea97de3745804881d7446d34'>dejagnu.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/dejagnu.scm?id=3211f45f0b741d5dea97de3745804881d7446d34&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-03-23 04:41:35 -0400'>2018-03-23</span></td><td><a href='/guix/commit/gnu/packages/dejagnu.scm?id=f97cb24967c2787034c3d9a5fce2cf4c1b0c0b3a'>gnu: dejagnu: Return #t from all phases.</a><span class='msg-avail'>...</span></td><td>Mark H Weaver</td></tr>
<tr><td><span title='2017-11-02 13:12:15 +0200'>2017-11-02</span></td><td><a href='/guix/commit/gnu/packages/dejagnu.scm?id=30ee6bf5d2806164de417fb44dbb6eb342e1f6d3'>gnu: dejagnu: Update to 1.6.1.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>