[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2179: Improve ATattribute dumping and fix epoll.h

[Denis Silakov]

------------------------------------------------------------
revno: 2179
committer: Denis Silakov <dsilakov at gmail.com>
branch nick: build_env
timestamp: Tue 2014-01-14 23:59:37 +0400
message:
  Improve ATattribute dumping and fix epoll.h
modified:
  headers/sys/epoll.h
  specdb.pm
-------------- next part --------------
=== modified file 'headers/sys/epoll.h'
--- a/headers/sys/epoll.h	2011-01-05 19:23:32 +0000
+++ b/headers/sys/epoll.h	2014-01-14 19:59:37 +0000
@@ -35,7 +35,15 @@
     struct epoll_event {
 	uint32_t events;
 	epoll_data_t data;
-    };
+    }
+#if defined __i386__
+/* IA32 */ (__packed__)
+#endif
+#if defined __x86_64__
+/* x86-64 */
+     (__packed__)
+#endif
+    ;
 
 
 /* Function prototypes */

=== modified file 'specdb.pm'
--- a/specdb.pm	2013-10-24 17:45:47 +0000
+++ b/specdb.pm	2014-01-14 19:59:37 +0000
@@ -150,6 +150,33 @@
     return $roottypes{($Aid,$basetype)};
 }
 
+# Dump ATattribute for type
+
+sub display_ATattribute($$$)
+{
+    local ($Tid, $ArchId, $ATattribute) = @_;
+
+    if( $ATattribute ) {
+        print "__attribute__ (".$ATattribute.")";
+    }
+    elsif ($ArchId == 1) {
+        $attrselect = "SELECT ATattribute, ATaid, Aname, Asymbol FROM ArchType ";
+        $attrselect.= "JOIN Architecture ON Aid=ATaid ";
+        $attrselect.= "WHERE ATtid=$Tid AND ATattribute IS NOT NULL ";
+        $attrselect.= "AND ATappearedin='$typeAppeared'";
+        $attrh = $dbh->prepare($attrselect);
+        $attrh->execute or die "Couldn't execute $attrselect query: ".DBI->errstr;
+        for(1..$attrh->rows) {
+            $entry = $attrh->fetchrow_hashref;
+            print "#if ".$entry->{'Asymbol'}."\n";
+            print "/* ".$entry->{'Aname'}." */\n";
+            print $entry->{'ATattribute'}."\n";
+            print "#endif\n";
+        }
+        $attrh->finish;
+    }
+}
+
 ##############################################
 # Get identifiers for elements by their names
 ##############################################
@@ -546,7 +573,7 @@
             print "[".$entry->{'ATsize'}."]";
         }
         if( !$nameonly && $$type{'ATattribute'} ) {
-            print "__attribute__ (".$$type{'ATattribute'}.")";
+            display_ATattribute($$type{'Tid'}, $ArchId, $$type{'ATattribute'});
         }
         if (!$nameonly) {
             if( $$type{'Tdescription'} ) {
@@ -811,9 +838,8 @@
             }
         }
         if ($tmh->rows ) { print "}\n"; }
-        if( $$type{'ATattribute'} ) {
-            print "__attribute__ (".$$type{'ATattribute'}.")";
-        }
+
+        display_ATattribute($Tid, $ArchId, $$type{'ATattribute'});
         $tmh->finish;
         return;
     }