[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2066: add register-access shortcuts for ucontext (bug 3719)

Mats Wichmann mats at linuxfoundation.org
Fri Feb 8 16:42:46 UTC 2013


------------------------------------------------------------
revno: 2066
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Fri 2013-02-08 09:42:46 -0700
message:
  add register-access shortcuts for ucontext (bug 3719)
modified:
  headers/IA32/4.1/ucontext.h.defs
  headers/IA32/5.0/ucontext.h.defs
  headers/IA64/4.1/ucontext.h.defs
  headers/IA64/5.0/ucontext.h.defs
  headers/PPC64/4.1/ucontext.h.defs
  headers/PPC64/5.0/ucontext.h.defs
  headers/ucontext.h
  headers/x86-64/4.1/ucontext.h.defs
  headers/x86-64/5.0/ucontext.h.defs
  package/Makefile
-------------- next part --------------
=== modified file 'headers/IA32/4.1/ucontext.h.defs'
--- a/headers/IA32/4.1/ucontext.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/IA32/4.1/ucontext.h.defs	2013-02-08 16:42:46 +0000
@@ -1,4 +1,26 @@
 
+enum {
+    REG_GS = 0,
+    REG_FS = 1,
+    REG_ES = 2,
+    REG_DS = 3,
+    REG_EDI = 4,
+    REG_ESI = 5,
+    REG_EBP = 6,
+    REG_ESP = 7,
+    REG_EBX = 8,
+    REG_EDX = 9,
+    REG_ECX = 10,
+    REG_EAX = 11,
+    REG_TRAPNO = 12,
+    REG_ERR = 13,
+    REG_EIP = 14,
+    REG_CS = 15,
+    REG_EFL = 16,
+    REG_UESP = 17,
+    REG_SS = 18
+};
+
 typedef int greg_t;
 
 #define NGREG	19

=== modified file 'headers/IA32/5.0/ucontext.h.defs'
--- a/headers/IA32/5.0/ucontext.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/IA32/5.0/ucontext.h.defs	2013-02-08 16:42:46 +0000
@@ -1,4 +1,26 @@
 
+enum {
+    REG_GS = 0,
+    REG_FS = 1,
+    REG_ES = 2,
+    REG_DS = 3,
+    REG_EDI = 4,
+    REG_ESI = 5,
+    REG_EBP = 6,
+    REG_ESP = 7,
+    REG_EBX = 8,
+    REG_EDX = 9,
+    REG_ECX = 10,
+    REG_EAX = 11,
+    REG_TRAPNO = 12,
+    REG_ERR = 13,
+    REG_EIP = 14,
+    REG_CS = 15,
+    REG_EFL = 16,
+    REG_UESP = 17,
+    REG_SS = 18
+};
+
 typedef int greg_t;
 
 #define NGREG	19

=== modified file 'headers/IA64/4.1/ucontext.h.defs'
--- a/headers/IA64/4.1/ucontext.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/IA64/4.1/ucontext.h.defs	2013-02-08 16:42:46 +0000
@@ -1,4 +1,22 @@
 
+#define rPOS	r16
+#define rTMP	r16
+#define rCPOS	r17
+#define rB5	r18
+#define rNAT	r18
+#define rB4	r19
+#define rB3	r20
+#define rB2	r21
+#define rB1	r22
+#define rB0	r23
+#define rRSC	r24
+#define rBSP	r25
+#define rRNAT	r26
+#define rUNAT	r27
+#define rFPSR	r28
+#define rPFS	r29
+#define rLC	r30
+#define rPR	r31
 #define _SC_GR0_OFFSET	\
 	(((char *) &((struct sigcontext *) 0)->sc_gr[0]) - (char *) 0)
 

=== modified file 'headers/IA64/5.0/ucontext.h.defs'
--- a/headers/IA64/5.0/ucontext.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/IA64/5.0/ucontext.h.defs	2013-02-08 16:42:46 +0000
@@ -1,4 +1,22 @@
 
+#define rPOS	r16
+#define rTMP	r16
+#define rCPOS	r17
+#define rB5	r18
+#define rNAT	r18
+#define rB4	r19
+#define rB3	r20
+#define rB2	r21
+#define rB1	r22
+#define rB0	r23
+#define rRSC	r24
+#define rBSP	r25
+#define rRNAT	r26
+#define rUNAT	r27
+#define rFPSR	r28
+#define rPFS	r29
+#define rLC	r30
+#define rPR	r31
 #define _SC_GR0_OFFSET	\
 	(((char *) &((struct sigcontext *) 0)->sc_gr[0]) - (char *) 0)
 

=== modified file 'headers/PPC64/4.1/ucontext.h.defs'
--- a/headers/PPC64/4.1/ucontext.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/PPC64/4.1/ucontext.h.defs	2013-02-08 16:42:46 +0000
@@ -1,4 +1,7 @@
 
+#define define NFPREG	33
+#define define NVRREG	34
+
 typedef struct _libc_vscr {
     int __pad[3];
     int vscr_word;

=== modified file 'headers/PPC64/5.0/ucontext.h.defs'
--- a/headers/PPC64/5.0/ucontext.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/PPC64/5.0/ucontext.h.defs	2013-02-08 16:42:46 +0000
@@ -1,4 +1,7 @@
 
+#define define NFPREG	33
+#define define NVRREG	34
+
 typedef struct _libc_vscr {
     int __pad[3];
     int vscr_word;

=== modified file 'headers/ucontext.h'
--- a/headers/ucontext.h	2012-04-09 22:25:23 +0000
+++ b/headers/ucontext.h	2013-02-08 16:42:46 +0000
@@ -21,6 +21,33 @@
 #endif
 #endif				/* __LSB_VERSION__ >= 1.3 */
 
+#if __LSB_VERSION__ >= 41
+#if defined __powerpc64__
+#define define NFPREG	33
+#define define NVRREG	34
+#endif
+#if defined __ia64__
+#define rPOS	r16
+#define rTMP	r16
+#define rCPOS	r17
+#define rB5	r18
+#define rNAT	r18
+#define rB4	r19
+#define rB3	r20
+#define rB2	r21
+#define rB1	r22
+#define rB0	r23
+#define rRSC	r24
+#define rBSP	r25
+#define rRNAT	r26
+#define rUNAT	r27
+#define rFPSR	r28
+#define rPFS	r29
+#define rLC	r30
+#define rPR	r31
+#endif
+#endif				/* __LSB_VERSION__ >= 4.1 */
+
 
 
 #if __LSB_VERSION__ >= 20
@@ -60,6 +87,63 @@
 #endif
 #endif				/* __LSB_VERSION__ >= 2.0 */
 
+#if __LSB_VERSION__ >= 41
+#if defined __i386__
+/* IA32 */
+    enum {
+	REG_GS = 0,
+	REG_FS = 1,
+	REG_ES = 2,
+	REG_DS = 3,
+	REG_EDI = 4,
+	REG_ESI = 5,
+	REG_EBP = 6,
+	REG_ESP = 7,
+	REG_EBX = 8,
+	REG_EDX = 9,
+	REG_ECX = 10,
+	REG_EAX = 11,
+	REG_TRAPNO = 12,
+	REG_ERR = 13,
+	REG_EIP = 14,
+	REG_CS = 15,
+	REG_EFL = 16,
+	REG_UESP = 17,
+	REG_SS = 18
+    };
+
+#endif
+#if defined __x86_64__
+/* x86-64 */
+    enum {
+	REG_R8 = 0,
+	REG_R9 = 1,
+	REG_R10 = 2,
+	REG_R11 = 3,
+	REG_R12 = 4,
+	REG_R13 = 5,
+	REG_R14 = 6,
+	REG_R15 = 7,
+	REG_RDI = 8,
+	REG_RSI = 9,
+	REG_RBP = 10,
+	REG_RBX = 11,
+	REG_RDX = 12,
+	REG_RAX = 13,
+	REG_RCX = 14,
+	REG_RSP = 15,
+	REG_RIP = 16,
+	REG_ELF = 17,
+	REG_CSGSFS = 18,
+	REG_ERR = 19,
+	REG_TRAPNO1 = 20,
+	REG_OLDMASK = 21,
+	REG_CR2 = 22
+    };
+
+#endif
+#endif				/* __LSB_VERSION__ >= 4.1 */
+
 #if __LSB_VERSION__ >= 20
 #if defined __powerpc64__
 /* PPC64 */

=== modified file 'headers/x86-64/4.1/ucontext.h.defs'
--- a/headers/x86-64/4.1/ucontext.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/x86-64/4.1/ucontext.h.defs	2013-02-08 16:42:46 +0000
@@ -7,6 +7,31 @@
 struct _libc_xmmreg {
     uint32_t element[4];
 };
+enum {
+    REG_R8 = 0,
+    REG_R9 = 1,
+    REG_R10 = 2,
+    REG_R11 = 3,
+    REG_R12 = 4,
+    REG_R13 = 5,
+    REG_R14 = 6,
+    REG_R15 = 7,
+    REG_RDI = 8,
+    REG_RSI = 9,
+    REG_RBP = 10,
+    REG_RBX = 11,
+    REG_RDX = 12,
+    REG_RAX = 13,
+    REG_RCX = 14,
+    REG_RSP = 15,
+    REG_RIP = 16,
+    REG_ELF = 17,
+    REG_CSGSFS = 18,
+    REG_ERR = 19,
+    REG_TRAPNO1 = 20,
+    REG_OLDMASK = 21,
+    REG_CR2 = 22
+};
 
 typedef long int greg_t;
 

=== modified file 'headers/x86-64/5.0/ucontext.h.defs'
--- a/headers/x86-64/5.0/ucontext.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/x86-64/5.0/ucontext.h.defs	2013-02-08 16:42:46 +0000
@@ -7,6 +7,31 @@
 struct _libc_xmmreg {
     uint32_t element[4];
 };
+enum {
+    REG_R8 = 0,
+    REG_R9 = 1,
+    REG_R10 = 2,
+    REG_R11 = 3,
+    REG_R12 = 4,
+    REG_R13 = 5,
+    REG_R14 = 6,
+    REG_R15 = 7,
+    REG_RDI = 8,
+    REG_RSI = 9,
+    REG_RBP = 10,
+    REG_RBX = 11,
+    REG_RDX = 12,
+    REG_RAX = 13,
+    REG_RCX = 14,
+    REG_RSP = 15,
+    REG_RIP = 16,
+    REG_ELF = 17,
+    REG_CSGSFS = 18,
+    REG_ERR = 19,
+    REG_TRAPNO1 = 20,
+    REG_OLDMASK = 21,
+    REG_CR2 = 22
+};
 
 typedef long int greg_t;
 

=== modified file 'package/Makefile'
--- a/package/Makefile	2013-02-07 16:41:47 +0000
+++ b/package/Makefile	2013-02-08 16:42:46 +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)



More information about the lsb-messages mailing list