From: Mark H Weaver <mhw@netris.org>
To: Ricardo Wurmus <rekado@elephly.net>
Cc: 27489@debbugs.gnu.org
Subject: bug#27489: glibc fails to build on i686
Date: Sun, 25 Jun 2017 21:23:44 -0400 [thread overview]
Message-ID: <87r2y7h78f.fsf@netris.org> (raw)
In-Reply-To: <87vanjhame.fsf@netris.org> (Mark H. Weaver's message of "Sun, 25 Jun 2017 20:10:33 -0400")
Mark H Weaver <mhw@netris.org> writes:
> The problem is that glibc-CVE-2017-1000366-pt2.patch introduces a
> reference to 'strcspn' in rtld.c. This causes the glibc build system to
> automatically add 'rtld-strcspn.os' and 'rtld-strcspn-c.os' to the list
> of objects to be built. When 'rtld-strcspn-c.os' is built, "-msse4" is
> passed to the compiler (along with "-mno-sse" near the end).
I found a patch in Debian to address this issue:
--8<---------------cut here---------------start------------->8---
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
--8<---------------cut here---------------end--------------->8---
With this patch added, the grafted glibc builds successfully on i686.
I'm doing a few more tests, and then will push this in the next hour or
two.
Mark
next prev parent reply other threads:[~2017-06-26 1:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-25 19:19 bug#27489: glibc fails to build on i686 Ricardo Wurmus
2017-06-25 21:08 ` Mark H Weaver
2017-06-25 22:02 ` Mark H Weaver
2017-06-26 0:10 ` Mark H Weaver
2017-06-26 1:23 ` Mark H Weaver [this message]
2017-06-26 2:03 ` Mark H Weaver
2017-06-26 8:03 ` Ricardo Wurmus
2017-06-29 0:57 ` Adonay Felipe Nogueira
2017-06-29 2:52 ` Leo Famulari
2017-06-29 5:00 ` Mark H Weaver
2017-06-30 12:05 ` Adonay Felipe Nogueira
2017-07-03 4:49 ` Mark H Weaver
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r2y7h78f.fsf@netris.org \
--to=mhw@netris.org \
--cc=27489@debbugs.gnu.org \
--cc=rekado@elephly.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).