From a40bdcb8a8bb57762bb5b3b842ab533fa67c61f0faf0ac841095ee18a185f0ef Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 12 Feb 2015 14:16:06 +0000 Subject: [PATCH] Accepting request 285812 from home:Andreas_Schwab:Factory - htm-tabort.patch: Fix TABORT encoding for little endian OBS-URL: https://build.opensuse.org/request/show/285812 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=392 --- glibc-testsuite.changes | 5 +++++ glibc-testsuite.spec | 4 ++++ glibc-utils.changes | 5 +++++ glibc-utils.spec | 4 ++++ glibc.changes | 5 +++++ glibc.spec | 4 ++++ htm-tabort.patch | 18 ++++++++++++++++++ 7 files changed, 45 insertions(+) create mode 100644 htm-tabort.patch diff --git a/glibc-testsuite.changes b/glibc-testsuite.changes index c41149b..7745074 100644 --- a/glibc-testsuite.changes +++ b/glibc-testsuite.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 12 13:10:20 UTC 2015 - schwab@suse.de + +- htm-tabort.patch: Fix TABORT encoding for little endian + ------------------------------------------------------------------- Mon Feb 9 09:26:01 UTC 2015 - schwab@suse.de diff --git a/glibc-testsuite.spec b/glibc-testsuite.spec index 37e8e69..303ba3b 100644 --- a/glibc-testsuite.spec +++ b/glibc-testsuite.spec @@ -231,6 +231,8 @@ Patch306: glibc-fix-double-loopback.diff ### # Patches from upstream ### +# PATCH-FIX-UPSTREAM powerpc: Fix TABORT encoding for little endian +Patch1000: htm-tabort.patch ### # Patches awaiting upstream approval @@ -449,6 +451,8 @@ rm nscd/s-stamp %patch304 -p1 %patch306 -p1 +%patch1000 -p1 + %patch2000 -p1 %patch2002 -p1 %patch2003 -p1 diff --git a/glibc-utils.changes b/glibc-utils.changes index c41149b..7745074 100644 --- a/glibc-utils.changes +++ b/glibc-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 12 13:10:20 UTC 2015 - schwab@suse.de + +- htm-tabort.patch: Fix TABORT encoding for little endian + ------------------------------------------------------------------- Mon Feb 9 09:26:01 UTC 2015 - schwab@suse.de diff --git a/glibc-utils.spec b/glibc-utils.spec index 523f048..5a31dd9 100644 --- a/glibc-utils.spec +++ b/glibc-utils.spec @@ -230,6 +230,8 @@ Patch306: glibc-fix-double-loopback.diff ### # Patches from upstream ### +# PATCH-FIX-UPSTREAM powerpc: Fix TABORT encoding for little endian +Patch1000: htm-tabort.patch ### # Patches awaiting upstream approval @@ -449,6 +451,8 @@ rm nscd/s-stamp %patch304 -p1 %patch306 -p1 +%patch1000 -p1 + %patch2000 -p1 %patch2002 -p1 %patch2003 -p1 diff --git a/glibc.changes b/glibc.changes index c41149b..7745074 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 12 13:10:20 UTC 2015 - schwab@suse.de + +- htm-tabort.patch: Fix TABORT encoding for little endian + ------------------------------------------------------------------- Mon Feb 9 09:26:01 UTC 2015 - schwab@suse.de diff --git a/glibc.spec b/glibc.spec index fd2c3bb..12cafe1 100644 --- a/glibc.spec +++ b/glibc.spec @@ -231,6 +231,8 @@ Patch306: glibc-fix-double-loopback.diff ### # Patches from upstream ### +# PATCH-FIX-UPSTREAM powerpc: Fix TABORT encoding for little endian +Patch1000: htm-tabort.patch ### # Patches awaiting upstream approval @@ -449,6 +451,8 @@ rm nscd/s-stamp %patch304 -p1 %patch306 -p1 +%patch1000 -p1 + %patch2000 -p1 %patch2002 -p1 %patch2003 -p1 diff --git a/htm-tabort.patch b/htm-tabort.patch new file mode 100644 index 0000000..209b334 --- /dev/null +++ b/htm-tabort.patch @@ -0,0 +1,18 @@ +2015-02-12 Adhemerval Zanella + + * sysdeps/unix/sysv/linux/powerpc/htm.h [TABORT]: Fix encoding for + little endian. + +Index: glibc-2.21/sysdeps/unix/sysv/linux/powerpc/htm.h +=================================================================== +--- glibc-2.21.orig/sysdeps/unix/sysv/linux/powerpc/htm.h ++++ glibc-2.21/sysdeps/unix/sysv/linux/powerpc/htm.h +@@ -60,7 +60,7 @@ + #define TBEGIN ".long 0x7c00051d" + #define TEND ".long 0x7c00055d" + #if __BYTE_ORDER == __LITTLE_ENDIAN +-# define TABORT ".byte 0x1d,0x07,%1,0x1d" ++# define TABORT ".byte 0x1d,0x07,%1,0x7c" + #else + # define TABORT ".byte 0x7c,%1,0x07,0x1d" + #endif