[Lsb-messages] /var/www/bzr/lsb/devel/misc-test r2269: changes to make devchk happy (bug 3505 and 3503)

Mats Wichmann mats at linuxfoundation.org
Wed May 2 13:07:54 UTC 2012


------------------------------------------------------------
revno: 2269
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: misc-test
timestamp: Wed 2012-05-02 07:07:54 -0600
message:
  changes to make devchk happy (bug 3505 and 3503)
modified:
  devchk/ts/devchk/inttypes_h.c
  devchk/ts/devchk/signal_h.c
-------------- next part --------------
=== modified file 'devchk/ts/devchk/inttypes_h.c'
--- a/devchk/ts/devchk/inttypes_h.c	2012-03-19 10:02:35 +0000
+++ b/devchk/ts/devchk/inttypes_h.c	2012-05-02 13:07:54 +0000
@@ -32,7 +32,7 @@
 Msg("Checking data structures in inttypes.h\n");
 #if defined __powerpc64__
 #ifdef __PRI64_PREFIX
-	CompareConstant(__PRI64_PREFIX,"l",1251,architecture,2.0,NULL)
+	CompareMacro(__PRI64_PREFIX,"l","l",1251,architecture,2.0,NULL)
 #else
 Msg( "Error: Constant not found: __PRI64_PREFIX\n");
 cnt++;
@@ -40,7 +40,7 @@
 
 #elif defined __powerpc__ && !defined __powerpc64__
 #ifdef __PRI64_PREFIX
-	CompareConstant(__PRI64_PREFIX,"ll",1251,architecture,1.2,NULL)
+	CompareMacro(__PRI64_PREFIX,"ll","ll",1251,architecture,1.2,NULL)
 #else
 Msg( "Error: Constant not found: __PRI64_PREFIX\n");
 cnt++;
@@ -48,7 +48,7 @@
 
 #elif defined __ia64__
 #ifdef __PRI64_PREFIX
-	CompareConstant(__PRI64_PREFIX,"l",1251,architecture,1.3,NULL)
+	CompareMacro(__PRI64_PREFIX,"l","l",1251,architecture,1.3,NULL)
 #else
 Msg( "Error: Constant not found: __PRI64_PREFIX\n");
 cnt++;
@@ -56,7 +56,7 @@
 
 #elif defined __i386__
 #ifdef __PRI64_PREFIX
-	CompareConstant(__PRI64_PREFIX,"ll",1251,architecture,1.2,NULL)
+	CompareMacro(__PRI64_PREFIX,"ll","ll",1251,architecture,1.2,NULL)
 #else
 Msg( "Error: Constant not found: __PRI64_PREFIX\n");
 cnt++;
@@ -64,7 +64,7 @@
 
 #elif defined __s390x__
 #ifdef __PRI64_PREFIX
-	CompareConstant(__PRI64_PREFIX,"l",1251,architecture,1.3,NULL)
+	CompareMacro(__PRI64_PREFIX,"l","l",1251,architecture,1.3,NULL)
 #else
 Msg( "Error: Constant not found: __PRI64_PREFIX\n");
 cnt++;
@@ -72,7 +72,7 @@
 
 #elif defined __x86_64__
 #ifdef __PRI64_PREFIX
-	CompareConstant(__PRI64_PREFIX,"l",1251,architecture,2.0,NULL)
+	CompareMacro(__PRI64_PREFIX,"l","l",1251,architecture,2.0,NULL)
 #else
 Msg( "Error: Constant not found: __PRI64_PREFIX\n");
 cnt++;
@@ -80,21 +80,20 @@
 
 #elif defined __s390__ && !defined __s390x__
 #ifdef __PRI64_PREFIX
-	CompareConstant(__PRI64_PREFIX,"ll",1251,architecture,1.3,NULL)
+	CompareMacro(__PRI64_PREFIX,"ll","ll",1251,architecture,1.3,NULL)
 #else
 Msg( "Error: Constant not found: __PRI64_PREFIX\n");
 cnt++;
 #endif
 
 #else
-Msg( "No definition for __PRI64_PREFIX (1251, int) in db for this architecture\n");
+Msg( "No definition for __PRI64_PREFIX (1251, literal) in db for this architecture\n");
 #ifdef __PRI64_PREFIX
-Sql( "REPLACE INTO ArchConst (ACaid,ACcid,ACvalue,ACappearedin,ACwithdrawnin) VALUES (%d,1251,%d,'""1.3""',NULL);\n", architecture, __PRI64_PREFIX);
 #endif
 #endif
 #if defined __powerpc64__
 #ifdef __PRIPTR_PREFIX
-	CompareConstant(__PRIPTR_PREFIX,"l",1252,architecture,2.0,NULL)
+	CompareMacro(__PRIPTR_PREFIX,"l","l",1252,architecture,2.0,NULL)
 #else
 Msg( "Error: Constant not found: __PRIPTR_PREFIX\n");
 cnt++;
@@ -102,7 +101,7 @@
 
 #elif defined __powerpc__ && !defined __powerpc64__
 #ifdef __PRIPTR_PREFIX
-	CompareConstant(__PRIPTR_PREFIX,,1252,architecture,1.2,NULL)
+	CompareMacro(__PRIPTR_PREFIX,,,1252,architecture,1.2,NULL)
 #else
 Msg( "Error: Constant not found: __PRIPTR_PREFIX\n");
 cnt++;
@@ -110,7 +109,7 @@
 
 #elif defined __ia64__
 #ifdef __PRIPTR_PREFIX
-	CompareConstant(__PRIPTR_PREFIX,"l",1252,architecture,1.3,NULL)
+	CompareMacro(__PRIPTR_PREFIX,"l","l",1252,architecture,1.3,NULL)
 #else
 Msg( "Error: Constant not found: __PRIPTR_PREFIX\n");
 cnt++;
@@ -118,7 +117,7 @@
 
 #elif defined __i386__
 #ifdef __PRIPTR_PREFIX
-	CompareConstant(__PRIPTR_PREFIX,,1252,architecture,1.2,NULL)
+	CompareMacro(__PRIPTR_PREFIX,,,1252,architecture,1.2,NULL)
 #else
 Msg( "Error: Constant not found: __PRIPTR_PREFIX\n");
 cnt++;
@@ -126,7 +125,7 @@
 
 #elif defined __s390x__
 #ifdef __PRIPTR_PREFIX
-	CompareConstant(__PRIPTR_PREFIX,"l",1252,architecture,1.3,NULL)
+	CompareMacro(__PRIPTR_PREFIX,"l","l",1252,architecture,1.3,NULL)
 #else
 Msg( "Error: Constant not found: __PRIPTR_PREFIX\n");
 cnt++;
@@ -134,7 +133,7 @@
 
 #elif defined __x86_64__
 #ifdef __PRIPTR_PREFIX
-	CompareConstant(__PRIPTR_PREFIX,"l",1252,architecture,2.0,NULL)
+	CompareMacro(__PRIPTR_PREFIX,"l","l",1252,architecture,2.0,NULL)
 #else
 Msg( "Error: Constant not found: __PRIPTR_PREFIX\n");
 cnt++;
@@ -142,16 +141,15 @@
 
 #elif defined __s390__ && !defined __s390x__
 #ifdef __PRIPTR_PREFIX
-	CompareConstant(__PRIPTR_PREFIX,,1252,architecture,1.3,NULL)
+	CompareMacro(__PRIPTR_PREFIX,,,1252,architecture,1.3,NULL)
 #else
 Msg( "Error: Constant not found: __PRIPTR_PREFIX\n");
 cnt++;
 #endif
 
 #else
-Msg( "No definition for __PRIPTR_PREFIX (1252, int) in db for this architecture\n");
+Msg( "No definition for __PRIPTR_PREFIX (1252, literal) in db for this architecture\n");
 #ifdef __PRIPTR_PREFIX
-Sql( "REPLACE INTO ArchConst (ACaid,ACcid,ACvalue,ACappearedin,ACwithdrawnin) VALUES (%d,1252,%d,'""1.3""',NULL);\n", architecture, __PRIPTR_PREFIX);
 #endif
 #endif
 #if _LSB_DEFAULT_ARCH

=== modified file 'devchk/ts/devchk/signal_h.c'
--- a/devchk/ts/devchk/signal_h.c	2011-12-08 09:18:09 +0000
+++ b/devchk/ts/devchk/signal_h.c	2012-05-02 13:07:54 +0000
@@ -1922,8 +1922,6 @@
 CheckOffset(struct _fpstate,_st,32,11,40395)
 CheckMemberSize(struct _fpstate,_xmm,256,11,40396)
 CheckOffset(struct _fpstate,_xmm,160,11,40396)
-CheckMemberSize(struct _fpstate,padding,96,11,40397)
-CheckOffset(struct _fpstate,padding,416,11,40397)
 #elif defined __i386__
 CheckTypeSize(struct _fpstate,624, 10198, 2, 2.0, NULL, 0, NULL)
 CheckMemberSize(struct _fpstate,sw,4,2,34225)
@@ -1954,8 +1952,6 @@
 CheckOffset(struct _fpstate,_fxsr_st,144,2,34243)
 CheckMemberSize(struct _fpstate,_xmm,128,2,34244)
 CheckOffset(struct _fpstate,_xmm,272,2,34244)
-CheckMemberSize(struct _fpstate,padding,224,2,34245)
-CheckOffset(struct _fpstate,padding,400,2,34245)
 #endif
 
 #if defined __i386__



More information about the lsb-messages mailing list