[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1973: finish fixing the def of extended state in ia32 fpstate (bug 3503)

Mats Wichmann mats at linuxfoundation.org
Thu May 31 12:00:45 UTC 2012


------------------------------------------------------------
revno: 1973
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Thu 2012-05-31 06:00:45 -0600
message:
  finish fixing the def of extended state in ia32 fpstate (bug 3503)
modified:
  headers/HACKS
  headers/signal.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/HACKS'
--- a/headers/HACKS	2012-05-29 20:02:45 +0000
+++ b/headers/HACKS	2012-05-31 12:00:45 +0000
@@ -3,4 +3,3 @@
 freetype/freetype.h
 freetype/ftimage.h
 freetype/ftsystem.h
-signal.h

=== modified file 'headers/signal.h'
--- a/headers/signal.h	2012-05-29 20:02:45 +0000
+++ b/headers/signal.h	2012-05-31 12:00:45 +0000
@@ -147,6 +147,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 */
+
 
 /* PPC64 stuff that doesn't belong here, but it has to be here to avoid nasty cyclic dependencies*/
 
@@ -783,20 +797,6 @@
 #endif
 #endif				/* __LSB_VERSION__ >= 2.0 */
 
-/*XXX hand-edit: moved from below _fpstate definition */
-#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 */
 
 /* FPU state information*/
 #if __LSB_VERSION__ >= 20
@@ -852,22 +852,6 @@
 #endif
 #endif				/* __LSB_VERSION__ >= 2.0 */
 
-#ifdef notdef			/*XXX hand-edit: moved to above _fpstate */
-#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 */
-#endif
-
 
 /* Process context when signal delivered*/
 #if __LSB_VERSION__ >= 20

=== modified file 'package/Makefile'
--- a/package/Makefile	2012-05-29 20:02:45 +0000
+++ b/package/Makefile	2012-05-31 12:00:45 +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=12
+RPM_PACKAGE_RELEASE=13
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)



More information about the lsb-messages mailing list