[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1960: extend i386 fpstate to match upstread (bug 3503)

[Mats Wichmann]

------------------------------------------------------------
revno: 1960
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Fri 2012-05-18 04:55:41 -0600
message:
  extend i386 fpstate to match upstread (bug 3503)
modified:
  headers/IA32/5.0/signal.h.defs
  headers/signal.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/IA32/5.0/signal.h.defs'
--- a/headers/IA32/5.0/signal.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/IA32/5.0/signal.h.defs	2012-05-18 10:55:41 +0000
@@ -45,7 +45,11 @@
     unsigned long int reserved;
     struct _fpxreg _fxsr_st[8];
     struct _xmmreg _xmm[8];
-    unsigned long int padding[56];
+    unsigned long int padding1[44];
+    union {
+	unsigned long int padding2[12];
+	struct _fpx_sw_bytes sw_reserved;
+    } padding1;
 };
 
 struct sigcontext {

=== modified file 'headers/signal.h'
--- a/headers/signal.h	2012-04-09 22:25:23 +0000
+++ b/headers/signal.h	2012-05-18 10:55:41 +0000
@@ -804,7 +804,18 @@
 	unsigned long int reserved;
 	struct _fpxreg _fxsr_st[8];
 	struct _xmmreg _xmm[8];
+#if __LSB_VERSION__ < 50
 	unsigned long int padding[56];
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	unsigned long int padding1[44];
+	union {
+#if __LSB_VERSION__ >= 50
+	    unsigned long int padding2[12];
+	    struct _fpx_sw_bytes sw_reserved;
+#endif				/* __LSB_VERSION__ >= 50 */
+	} padding1;
+#endif				/* __LSB_VERSION__ >= 50 */
     };
 
 #endif
@@ -827,6 +838,20 @@
 #endif
 #endif				/* __LSB_VERSION__ >= 2.0 */
 
+#if __LSB_VERSION__ >= 50
+#if defined __i386__
+/* IA32 */
+    struct _fpx_sw_bytes {
+	unsigned int magic1;
+	unsigned int extended_size;
+	unsigned long long int xstate_bv;
+	unsigned int xstate_size;
+	unsigned long int padding[7];
+    };
+
+#endif
+#endif				/* __LSB_VERSION__ >= 5.0 */
+
 
 /* Process context when signal delivered*/
 #if __LSB_VERSION__ >= 20

=== modified file 'package/Makefile'
--- a/package/Makefile	2012-05-16 15:06:18 +0000
+++ b/package/Makefile	2012-05-18 10:55:41 +0000
@@ -46,7 +46,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=1
+RPM_PACKAGE_RELEASE=2
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)