Attachment 930003 Details for Bug 1133134 – glibc.spec add glibc-rh1133134-i386-tlsinit.patch

[patch] glibc.spec add glibc-rh1133134-i386-tlsinit.patch

0001-add-glibc-rh1133134-i386-tlsinit.patch.patch (text/plain), 2.63 KB, created by Mark Wielaard on 2014-08-23 20:16:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Wielaard

Created: 2014-08-23 20:16:19 UTC

Size: 2.63 KB

patch

obsolete

>From 954713f4e086c3b3d60816a2afdafb201c4485f3 Mon Sep 17 00:00:00 2001
>From: Mark Wielaard <mjw@redhat.com>
>Date: Sat, 23 Aug 2014 22:07:54 +0200
>Subject: [PATCH] add glibc-rh1133134-i386-tlsinit.patch
>
>Resolves: #1133134
>---
> glibc-rh1133134-i386-tlsinit.patch | 19 +++++++++++++++++++
> glibc.spec                         |  8 +++++++-
> 2 files changed, 26 insertions(+), 1 deletion(-)
> create mode 100644 glibc-rh1133134-i386-tlsinit.patch
>
>diff --git a/glibc-rh1133134-i386-tlsinit.patch b/glibc-rh1133134-i386-tlsinit.patch
>new file mode 100644
>index 0000000..648c527
>--- /dev/null
>+++ b/glibc-rh1133134-i386-tlsinit.patch
>@@ -0,0 +1,19 @@
>+diff --git a/sysdeps/i386/nptl/tls.h b/sysdeps/i386/nptl/tls.h
>+index ac9c9a2..052ea64 100644
>+--- a/sysdeps/i386/nptl/tls.h
>++++ b/sysdeps/i386/nptl/tls.h
>+@@ -231,12 +231,8 @@ tls_fill_user_desc (union user_desc_init *desc,
>+      tls_fill_user_desc (&_segdescr, -1, _thrdescr);			      \
>+ 									      \
>+      /* Install the TLS.  */						      \
>+-     asm volatile (TLS_LOAD_EBX						      \
>+-		   "int $0x80\n\t"					      \
>+-		   TLS_LOAD_EBX						      \
>+-		   : "=a" (_result), "=m" (_segdescr.desc.entry_number)	      \
>+-		   : "0" (__NR_set_thread_area),			      \
>+-		     TLS_EBX_ARG (&_segdescr.desc), "m" (_segdescr.desc));    \
>++     INTERNAL_SYSCALL_DECL (err);					      \
>++     _result = INTERNAL_SYSCALL (set_thread_area, err, 1, &_segdescr.desc);   \
>+ 									      \
>+      if (_result == 0)							      \
>+        /* We know the index in the GDT, now load the segment register.	      \
>diff --git a/glibc.spec b/glibc.spec
>index 68aed24..84bcd6c 100644
>--- a/glibc.spec
>+++ b/glibc.spec
>@@ -1,6 +1,6 @@
> %define glibcsrcdir  glibc-2.19-883-g7e54fd0
> %define glibcversion 2.19.90
>-%define glibcrelease 34%{?dist}
>+%define glibcrelease 34.1.mjw%{?dist}
> # Pre-release tarballs are pulled in from git using a command that is
> # effectively:
> #
>@@ -185,6 +185,8 @@ Patch0046: %{name}-rh1013801.patch
> 
> Patch0047: %{name}-nscd-sysconfig.patch
> 
>+Patch0048: %{name}-rh1133134-i386-tlsinit.patch
>+
> ##############################################################################
> #
> # Patches from upstream
>@@ -552,6 +554,7 @@ package or when debugging this package.
> %patch0046 -p1
> %patch2031 -p1
> %patch0047 -p1
>+%patch0048 -p1
> %patch2033 -p1
> %patch2034 -p1
> %patch2035 -p1
>@@ -1660,6 +1663,9 @@ rm -f *.filelist*
> %endif
> 
> %changelog
>+* Sat Aug 23 2014 Mark Wielaard <mjw@redhat.com> - 2.19.90-34.1.mjw
>+- Add glibc-rh1133134-i386-tlsinit.patch. (#1133134)
>+
> * Fri Aug 22 2014 Dennis Gilmore <dennis@ausil.us> - 2.19.90-34
> - add back sss to nsswitch.conf we have added workarounds in the tools
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1133134: 930003 | 930372