[Lsb-messages] /var/www/bzr/lsb/4.0/misc-test r2086: backport __cxa_finalize to 3.x (bug 2471)

Mats Wichmann mats at linuxfoundation.org
Fri May 18 17:23:02 UTC 2012


------------------------------------------------------------
revno: 2086
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: misc-test
timestamp: Fri 2012-05-18 11:23:02 -0600
message:
  backport __cxa_finalize to 3.x (bug 2471)
added:
  .bzrignore
modified:
  elfchk/dynsyms.c
  libchk/libc_so_6.c
  libchk/libdl_so_2.c
  libchk/libgcc_s_so_1.c
  libchk/libpthread_so_0.c
  libchk/libstdcxx_so_6.c
  libchk/mkfunclist
-------------- next part --------------
=== added file '.bzrignore'
--- a/.bzrignore	1970-01-01 00:00:00 +0000
+++ b/.bzrignore	2012-05-18 17:23:02 +0000
@@ -0,0 +1,1 @@
+libchk/*.txt

=== modified file 'elfchk/dynsyms.c'
--- a/elfchk/dynsyms.c	2011-03-25 20:51:08 +0000
+++ b/elfchk/dynsyms.c	2012-05-18 17:23:02 +0000
@@ -13398,6 +13398,27 @@
 	{"__cxa_current_exception_type","CXXABI_1.3",0,LSB_Cpp},
 	{"__cxa_demangle","CXXABI_1.3",0,LSB_Cpp},
 	{"__cxa_end_catch","CXXABI_1.3",0,LSB_Cpp},
+#if defined __i386__
+	{"__cxa_finalize","GLIBC_2.1.3",0,LSB_Core},
+#endif
+#if defined __ia64__
+	{"__cxa_finalize","GLIBC_2.2",0,LSB_Core},
+#endif
+#if defined __powerpc__ && !defined __powerpc64__
+	{"__cxa_finalize","GLIBC_2.1.3",0,LSB_Core},
+#endif
+#if defined __powerpc64__
+	{"__cxa_finalize","GLIBC_2.3",0,LSB_Core},
+#endif
+#if defined __s390__ && !defined __s390x__
+	{"__cxa_finalize","GLIBC_2.1.3",0,LSB_Core},
+#endif
+#if defined __s390x__
+	{"__cxa_finalize","GLIBC_2.2",0,LSB_Core},
+#endif
+#if defined __x86_64__
+	{"__cxa_finalize","GLIBC_2.2.5",0,LSB_Core},
+#endif
 	{"__cxa_free_exception","CXXABI_1.3",0,LSB_Cpp},
 	{"__cxa_get_globals","CXXABI_1.3",0,LSB_Cpp},
 	{"__cxa_get_globals_fast","CXXABI_1.3",0,LSB_Cpp},
@@ -85759,6 +85780,27 @@
 	{"__cxa_current_exception_type","CXXABI_1.3",0,LSB_Cpp},
 	{"__cxa_demangle","CXXABI_1.3",0,LSB_Cpp},
 	{"__cxa_end_catch","CXXABI_1.3",0,LSB_Cpp},
+#if defined __i386__
+	{"__cxa_finalize","GLIBC_2.1.3",0,LSB_Core},
+#endif
+#if defined __ia64__
+	{"__cxa_finalize","GLIBC_2.2",0,LSB_Core},
+#endif
+#if defined __powerpc__ && !defined __powerpc64__
+	{"__cxa_finalize","GLIBC_2.1.3",0,LSB_Core},
+#endif
+#if defined __powerpc64__
+	{"__cxa_finalize","GLIBC_2.3",0,LSB_Core},
+#endif
+#if defined __s390__ && !defined __s390x__
+	{"__cxa_finalize","GLIBC_2.1.3",0,LSB_Core},
+#endif
+#if defined __s390x__
+	{"__cxa_finalize","GLIBC_2.2",0,LSB_Core},
+#endif
+#if defined __x86_64__
+	{"__cxa_finalize","GLIBC_2.2.5",0,LSB_Core},
+#endif
 	{"__cxa_free_exception","CXXABI_1.3",0,LSB_Cpp},
 	{"__cxa_get_globals","CXXABI_1.3",0,LSB_Cpp},
 	{"__cxa_get_globals_fast","CXXABI_1.3",0,LSB_Cpp},
@@ -205256,8 +205298,8 @@
 	{"_ZN10QTabWidget7qt_castEPKc","",1,LSB_Toolkit_Qt3},
 	{"_ZN10QTabWidget7qt_emitEiP8QUObject","",1,LSB_Toolkit_Qt3},
 	{"_ZN10QTabWidget7showTabEi","",1,LSB_Toolkit_Qt3},
+	{"_ZN10QTabWidget8selectedERK7QString","",0,LSB_Toolkit_Qt},
 	{"_ZN10QTabWidget8selectedERK7QString","",1,LSB_Toolkit_Qt3},
-	{"_ZN10QTabWidget8selectedERK7QString","",0,LSB_Toolkit_Qt},
 	{"_ZN10QTabWidget8showPageEP7QWidget","",1,LSB_Toolkit_Qt3},
 	{"_ZN10QTabWidget9changeTabEP7QWidgetRK7QString","",1,LSB_Toolkit_Qt3},
 	{"_ZN10QTabWidget9changeTabEP7QWidgetRK8QIconSetRK7QString","",1,LSB_Toolkit_Qt3},
@@ -212367,8 +212409,8 @@
 	{"_ZN18QStyleOptionSliderC2Ev","",0,LSB_Toolkit_Qt},
 	{"_ZN18QSyntaxHighlighter11qt_metacallEN11QMetaObject4CallEiPPv","",0,LSB_Toolkit_Qt},
 	{"_ZN18QSyntaxHighlighter11qt_metacastEPKc","",0,LSB_Toolkit_Qt},
+	{"_ZN18QSyntaxHighlighter11rehighlightEv","",0,LSB_Toolkit_Qt},
 	{"_ZN18QSyntaxHighlighter11rehighlightEv","",1,LSB_Toolkit_Qt3},
-	{"_ZN18QSyntaxHighlighter11rehighlightEv","",0,LSB_Toolkit_Qt},
 	{"_ZN18QSyntaxHighlighter11setDocumentEP13QTextDocument","",0,LSB_Toolkit_Qt},
 	{"_ZN18QSyntaxHighlighter16staticMetaObjectE","",0,LSB_Toolkit_Qt},
 	{"_ZN18QSyntaxHighlighter20setCurrentBlockStateEi","",0,LSB_Toolkit_Qt},
@@ -217760,8 +217802,8 @@
 	{"_ZN8QToolBoxD1Ev","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolBoxD2Ev","",0,LSB_Toolkit_Qt},
 	{"_ZN8QToolBoxD2Ev","",1,LSB_Toolkit_Qt3},
+	{"_ZN8QToolTip10setPaletteERK8QPalette","",0,LSB_Toolkit_Qt},
 	{"_ZN8QToolTip10setPaletteERK8QPalette","",1,LSB_Toolkit_Qt3},
-	{"_ZN8QToolTip10setPaletteERK8QPalette","",0,LSB_Toolkit_Qt},
 	{"_ZN8QToolTip14setWakeUpDelayEi","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolTip17isGloballyEnabledEv","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolTip18setGloballyEnabledEb","",1,LSB_Toolkit_Qt3},
@@ -217773,16 +217815,16 @@
 	{"_ZN8QToolTip3tipERK5QRectRK7QStringS2_","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolTip3tipERK5QRectRK7QStringS5_","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolTip3tipERK5QRectRK7QStringS5_S2_","",1,LSB_Toolkit_Qt3},
+	{"_ZN8QToolTip4fontEv","",0,LSB_Toolkit_Qt},
 	{"_ZN8QToolTip4fontEv","",1,LSB_Toolkit_Qt3},
-	{"_ZN8QToolTip4fontEv","",0,LSB_Toolkit_Qt},
 	{"_ZN8QToolTip4hideEv","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolTip5clearEv","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolTip6removeEP7QWidget","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolTip6removeEP7QWidgetRK5QRect","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolTip7paletteEv","",0,LSB_Toolkit_Qt},
 	{"_ZN8QToolTip7paletteEv","",1,LSB_Toolkit_Qt3},
+	{"_ZN8QToolTip7setFontERK5QFont","",0,LSB_Toolkit_Qt},
 	{"_ZN8QToolTip7setFontERK5QFont","",1,LSB_Toolkit_Qt3},
-	{"_ZN8QToolTip7setFontERK5QFont","",0,LSB_Toolkit_Qt},
 	{"_ZN8QToolTip7textForEP7QWidgetRK6QPoint","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolTip8showTextERK6QPointRK7QStringP7QWidget","",0,LSB_Toolkit_Qt},
 	{"_ZN8QToolTip8showTextERK6QPointRK7QStringP7QWidgetRK5QRect","",0,LSB_Toolkit_Qt},
@@ -219798,8 +219840,8 @@
 	{"_ZN9QTextEdit10moveCursorEN11QTextCursor13MoveOperationENS0_8MoveModeE","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit10moveCursorENS_12CursorActionE","",1,LSB_Toolkit_Qt3},
 	{"_ZN9QTextEdit10moveCursorENS_12CursorActionEN11QTextCursor8MoveModeE","",0,LSB_Toolkit_Qt},
+	{"_ZN9QTextEdit10moveCursorENS_12CursorActionEb","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit10moveCursorENS_12CursorActionEb","",1,LSB_Toolkit_Qt3},
-	{"_ZN9QTextEdit10moveCursorENS_12CursorActionEb","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit10normalCopyEv","",1,LSB_Toolkit_Qt3},
 	{"_ZN9QTextEdit10paintEventEP11QPaintEvent","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit10setEnabledEb","",1,LSB_Toolkit_Qt3},
@@ -220000,11 +220042,11 @@
 	{"_ZN9QTextEdit4findERK7QString6QFlagsIN13QTextDocument8FindFlagEE","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit4findERK7QStringbbbPiS3_","",1,LSB_Toolkit_Qt3},
 	{"_ZN9QTextEdit4initEv","",1,LSB_Toolkit_Qt3},
+	{"_ZN9QTextEdit4redoEv","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit4redoEv","",1,LSB_Toolkit_Qt3},
-	{"_ZN9QTextEdit4redoEv","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit4syncEv","",1,LSB_Toolkit_Qt3},
+	{"_ZN9QTextEdit4undoEv","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit4undoEv","",1,LSB_Toolkit_Qt3},
-	{"_ZN9QTextEdit4undoEv","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit5clearEv","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit5clearEv","",1,LSB_Toolkit_Qt3},
 	{"_ZN9QTextEdit5eventEP6QEvent","",0,LSB_Toolkit_Qt},
@@ -225496,8 +225538,8 @@
 	{"_ZNK8QPainter11hasClippingEv","",0,LSB_Toolkit_Qt},
 	{"_ZNK8QPainter11paintEngineEv","",0,LSB_Toolkit_Qt},
 	{"_ZNK8QPainter11renderHintsEv","",0,LSB_Toolkit_Qt},
+	{"_ZNK8QPainter11worldMatrixEv","",0,LSB_Toolkit_Qt},
 	{"_ZNK8QPainter11worldMatrixEv","",1,LSB_Toolkit_Qt3},
-	{"_ZNK8QPainter11worldMatrixEv","",0,LSB_Toolkit_Qt},
 	{"_ZNK8QPainter12deviceMatrixEv","",0,LSB_Toolkit_Qt},
 	{"_ZNK8QPainter12translationXEv","",0,LSB_Toolkit_Qt},
 	{"_ZNK8QPainter12translationYEv","",0,LSB_Toolkit_Qt},
@@ -295016,8 +295058,8 @@
 	{"_ZN10QTabWidget7qt_castEPKc","",1,LSB_Toolkit_Qt3},
 	{"_ZN10QTabWidget7qt_emitEiP8QUObject","",1,LSB_Toolkit_Qt3},
 	{"_ZN10QTabWidget7showTabEi","",1,LSB_Toolkit_Qt3},
+	{"_ZN10QTabWidget8selectedERK7QString","",0,LSB_Toolkit_Qt},
 	{"_ZN10QTabWidget8selectedERK7QString","",1,LSB_Toolkit_Qt3},
-	{"_ZN10QTabWidget8selectedERK7QString","",0,LSB_Toolkit_Qt},
 	{"_ZN10QTabWidget8showPageEP7QWidget","",1,LSB_Toolkit_Qt3},
 	{"_ZN10QTabWidget9changeTabEP7QWidgetRK7QString","",1,LSB_Toolkit_Qt3},
 	{"_ZN10QTabWidget9changeTabEP7QWidgetRK8QIconSetRK7QString","",1,LSB_Toolkit_Qt3},
@@ -302127,8 +302169,8 @@
 	{"_ZN18QStyleOptionSliderC2Ev","",0,LSB_Toolkit_Qt},
 	{"_ZN18QSyntaxHighlighter11qt_metacallEN11QMetaObject4CallEiPPv","",0,LSB_Toolkit_Qt},
 	{"_ZN18QSyntaxHighlighter11qt_metacastEPKc","",0,LSB_Toolkit_Qt},
+	{"_ZN18QSyntaxHighlighter11rehighlightEv","",0,LSB_Toolkit_Qt},
 	{"_ZN18QSyntaxHighlighter11rehighlightEv","",1,LSB_Toolkit_Qt3},
-	{"_ZN18QSyntaxHighlighter11rehighlightEv","",0,LSB_Toolkit_Qt},
 	{"_ZN18QSyntaxHighlighter11setDocumentEP13QTextDocument","",0,LSB_Toolkit_Qt},
 	{"_ZN18QSyntaxHighlighter16staticMetaObjectE","",0,LSB_Toolkit_Qt},
 	{"_ZN18QSyntaxHighlighter20setCurrentBlockStateEi","",0,LSB_Toolkit_Qt},
@@ -307520,8 +307562,8 @@
 	{"_ZN8QToolBoxD1Ev","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolBoxD2Ev","",0,LSB_Toolkit_Qt},
 	{"_ZN8QToolBoxD2Ev","",1,LSB_Toolkit_Qt3},
+	{"_ZN8QToolTip10setPaletteERK8QPalette","",0,LSB_Toolkit_Qt},
 	{"_ZN8QToolTip10setPaletteERK8QPalette","",1,LSB_Toolkit_Qt3},
-	{"_ZN8QToolTip10setPaletteERK8QPalette","",0,LSB_Toolkit_Qt},
 	{"_ZN8QToolTip14setWakeUpDelayEi","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolTip17isGloballyEnabledEv","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolTip18setGloballyEnabledEb","",1,LSB_Toolkit_Qt3},
@@ -307533,16 +307575,16 @@
 	{"_ZN8QToolTip3tipERK5QRectRK7QStringS2_","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolTip3tipERK5QRectRK7QStringS5_","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolTip3tipERK5QRectRK7QStringS5_S2_","",1,LSB_Toolkit_Qt3},
+	{"_ZN8QToolTip4fontEv","",0,LSB_Toolkit_Qt},
 	{"_ZN8QToolTip4fontEv","",1,LSB_Toolkit_Qt3},
-	{"_ZN8QToolTip4fontEv","",0,LSB_Toolkit_Qt},
 	{"_ZN8QToolTip4hideEv","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolTip5clearEv","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolTip6removeEP7QWidget","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolTip6removeEP7QWidgetRK5QRect","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolTip7paletteEv","",0,LSB_Toolkit_Qt},
 	{"_ZN8QToolTip7paletteEv","",1,LSB_Toolkit_Qt3},
+	{"_ZN8QToolTip7setFontERK5QFont","",0,LSB_Toolkit_Qt},
 	{"_ZN8QToolTip7setFontERK5QFont","",1,LSB_Toolkit_Qt3},
-	{"_ZN8QToolTip7setFontERK5QFont","",0,LSB_Toolkit_Qt},
 	{"_ZN8QToolTip7textForEP7QWidgetRK6QPoint","",1,LSB_Toolkit_Qt3},
 	{"_ZN8QToolTip8showTextERK6QPointRK7QStringP7QWidget","",0,LSB_Toolkit_Qt},
 	{"_ZN8QToolTip8showTextERK6QPointRK7QStringP7QWidgetRK5QRect","",0,LSB_Toolkit_Qt},
@@ -309558,8 +309600,8 @@
 	{"_ZN9QTextEdit10moveCursorEN11QTextCursor13MoveOperationENS0_8MoveModeE","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit10moveCursorENS_12CursorActionE","",1,LSB_Toolkit_Qt3},
 	{"_ZN9QTextEdit10moveCursorENS_12CursorActionEN11QTextCursor8MoveModeE","",0,LSB_Toolkit_Qt},
+	{"_ZN9QTextEdit10moveCursorENS_12CursorActionEb","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit10moveCursorENS_12CursorActionEb","",1,LSB_Toolkit_Qt3},
-	{"_ZN9QTextEdit10moveCursorENS_12CursorActionEb","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit10normalCopyEv","",1,LSB_Toolkit_Qt3},
 	{"_ZN9QTextEdit10paintEventEP11QPaintEvent","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit10setEnabledEb","",1,LSB_Toolkit_Qt3},
@@ -309760,11 +309802,11 @@
 	{"_ZN9QTextEdit4findERK7QString6QFlagsIN13QTextDocument8FindFlagEE","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit4findERK7QStringbbbPiS3_","",1,LSB_Toolkit_Qt3},
 	{"_ZN9QTextEdit4initEv","",1,LSB_Toolkit_Qt3},
+	{"_ZN9QTextEdit4redoEv","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit4redoEv","",1,LSB_Toolkit_Qt3},
-	{"_ZN9QTextEdit4redoEv","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit4syncEv","",1,LSB_Toolkit_Qt3},
+	{"_ZN9QTextEdit4undoEv","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit4undoEv","",1,LSB_Toolkit_Qt3},
-	{"_ZN9QTextEdit4undoEv","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit5clearEv","",0,LSB_Toolkit_Qt},
 	{"_ZN9QTextEdit5clearEv","",1,LSB_Toolkit_Qt3},
 	{"_ZN9QTextEdit5eventEP6QEvent","",0,LSB_Toolkit_Qt},
@@ -315256,8 +315298,8 @@
 	{"_ZNK8QPainter11hasClippingEv","",0,LSB_Toolkit_Qt},
 	{"_ZNK8QPainter11paintEngineEv","",0,LSB_Toolkit_Qt},
 	{"_ZNK8QPainter11renderHintsEv","",0,LSB_Toolkit_Qt},
+	{"_ZNK8QPainter11worldMatrixEv","",0,LSB_Toolkit_Qt},
 	{"_ZNK8QPainter11worldMatrixEv","",1,LSB_Toolkit_Qt3},
-	{"_ZNK8QPainter11worldMatrixEv","",0,LSB_Toolkit_Qt},
 	{"_ZNK8QPainter12deviceMatrixEv","",0,LSB_Toolkit_Qt},
 	{"_ZNK8QPainter12translationXEv","",0,LSB_Toolkit_Qt},
 	{"_ZNK8QPainter12translationYEv","",0,LSB_Toolkit_Qt},

=== modified file 'libchk/libc_so_6.c'
--- a/libchk/libc_so_6.c	2011-03-25 20:51:08 +0000
+++ b/libchk/libc_so_6.c	2012-05-18 17:23:02 +0000
@@ -588,7 +588,7 @@
 	{"__memcpy_chk","GLIBC_2.3.4",0,LSB_Core,0,1},
 	{"__memmove_chk","GLIBC_2.3.4",0,LSB_Core,0,1},
 #if defined __i386__
-	{"__mempcpy","GLIBC_2.0",0,LSB_Core,0,1},
+	{"__mempcpy","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"__mempcpy","GLIBC_2.0",0,LSB_Core,4,1},
@@ -628,7 +628,7 @@
 	{"__printf_chk","GLIBC_2.3.4",0,LSB_Core,4,1},
 #endif
 #if defined __i386__
-	{"__rawmemchr","GLIBC_2.1",0,LSB_Core,0,1},
+	{"__rawmemchr","GLIBC_2.1",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"__rawmemchr","GLIBC_2.1",0,LSB_Core,4,1},
@@ -1943,7 +1943,7 @@
 	{"bsd_signal","GLIBC_2.2.5",0,LSB_Core,8,1},
 #endif
 #if defined __i386__
-	{"bsearch","GLIBC_2.0",0,LSB_Core,0,1},
+	{"bsearch","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"bsearch","GLIBC_2.0",0,LSB_Core,4,1},
@@ -1997,7 +1997,7 @@
 	{"bzero","GLIBC_2.2.5",0,LSB_Core,1,1},
 #endif
 #if defined __i386__
-	{"calloc","GLIBC_2.0",0,LSB_Core,0,1},
+	{"calloc","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"calloc","GLIBC_2.0",0,LSB_Core,4,1},
@@ -7781,7 +7781,7 @@
 	{"ldiv","GLIBC_2.2.5",0,LSB_Core,16,1},
 #endif
 #if defined __i386__
-	{"lfind","GLIBC_2.0",0,LSB_Core,0,1},
+	{"lfind","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"lfind","GLIBC_2.0",0,LSB_Core,4,1},
@@ -8016,7 +8016,7 @@
 	{"lrand48_r","GLIBC_2.2.5",0,LSB_Core,4,1},
 #endif
 #if defined __i386__
-	{"lsearch","GLIBC_2.0",0,LSB_Core,0,1},
+	{"lsearch","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"lsearch","GLIBC_2.0",0,LSB_Core,4,1},
@@ -8088,7 +8088,7 @@
 	{"makecontext","GLIBC_2.2.5",0,LSB_Core,1,1},
 #endif
 #if defined __i386__
-	{"malloc","GLIBC_2.0",0,LSB_Core,0,1},
+	{"malloc","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"malloc","GLIBC_2.0",0,LSB_Core,4,1},
@@ -8250,7 +8250,7 @@
 	{"mbtowc","GLIBC_2.2.5",0,LSB_Core,4,1},
 #endif
 #if defined __i386__
-	{"memccpy","GLIBC_2.0",0,LSB_Core,0,1},
+	{"memccpy","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"memccpy","GLIBC_2.0",0,LSB_Core,4,1},
@@ -8268,7 +8268,7 @@
 	{"memccpy","GLIBC_2.2.5",0,LSB_Core,8,1},
 #endif
 #if defined __i386__
-	{"memchr","GLIBC_2.0",0,LSB_Core,0,1},
+	{"memchr","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"memchr","GLIBC_2.0",0,LSB_Core,4,1},
@@ -8304,7 +8304,7 @@
 	{"memcmp","GLIBC_2.2.5",0,LSB_Core,4,1},
 #endif
 #if defined __i386__
-	{"memcpy","GLIBC_2.0",0,LSB_Core,0,1},
+	{"memcpy","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"memcpy","GLIBC_2.0",0,LSB_Core,4,1},
@@ -8322,7 +8322,7 @@
 	{"memcpy","GLIBC_2.2.5",0,LSB_Core,8,1},
 #endif
 #if defined __i386__
-	{"memmem","GLIBC_2.0",0,LSB_Core,0,1},
+	{"memmem","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"memmem","GLIBC_2.0",0,LSB_Core,4,1},
@@ -8340,7 +8340,7 @@
 	{"memmem","GLIBC_2.2.5",0,LSB_Core,8,1},
 #endif
 #if defined __i386__
-	{"memmove","GLIBC_2.0",0,LSB_Core,0,1},
+	{"memmove","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"memmove","GLIBC_2.0",0,LSB_Core,4,1},
@@ -8358,7 +8358,7 @@
 	{"memmove","GLIBC_2.2.5",0,LSB_Core,8,1},
 #endif
 #if defined __i386__
-	{"memrchr","GLIBC_2.2",0,LSB_Core,0,1},
+	{"memrchr","GLIBC_2.2",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"memrchr","GLIBC_2.2",0,LSB_Core,4,1},
@@ -8376,7 +8376,7 @@
 	{"memrchr","GLIBC_2.2.5",0,LSB_Core,8,1},
 #endif
 #if defined __i386__
-	{"memset","GLIBC_2.0",0,LSB_Core,0,1},
+	{"memset","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"memset","GLIBC_2.0",0,LSB_Core,4,1},
@@ -8558,7 +8558,7 @@
 	{"mlockall","GLIBC_2.2.5",0,LSB_Core,4,1},
 #endif
 #if defined __i386__
-	{"mmap","GLIBC_2.0",0,LSB_Core,0,1},
+	{"mmap","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"mmap","GLIBC_2.0",0,LSB_Core,4,1},
@@ -8576,7 +8576,7 @@
 	{"mmap","GLIBC_2.2.5",0,LSB_Core,8,1},
 #endif
 #if defined __i386__
-	{"mmap64","GLIBC_2.1",0,LSB_Core,0,1},
+	{"mmap64","GLIBC_2.1",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"mmap64","GLIBC_2.1",0,LSB_Core,4,1},
@@ -8648,7 +8648,7 @@
 	{"mrand48_r","GLIBC_2.2.5",0,LSB_Core,4,1},
 #endif
 #if defined __i386__
-	{"mremap","GLIBC_2.0",0,LSB_Core,0,1},
+	{"mremap","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"mremap","GLIBC_2.0",0,LSB_Core,4,1},
@@ -10447,7 +10447,7 @@
 	{"readv","GLIBC_2.2.5",0,LSB_Core,8,1},
 #endif
 #if defined __i386__
-	{"realloc","GLIBC_2.0",0,LSB_Core,0,1},
+	{"realloc","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"realloc","GLIBC_2.0",0,LSB_Core,4,1},
@@ -10736,7 +10736,7 @@
 	{"rmdir","GLIBC_2.2.5",0,LSB_Core,4,1},
 #endif
 #if defined __i386__
-	{"sbrk","GLIBC_2.0",0,LSB_Core,0,1},
+	{"sbrk","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"sbrk","GLIBC_2.0",0,LSB_Core,4,1},
@@ -11723,7 +11723,7 @@
 	{"setvbuf","GLIBC_2.2.5",0,LSB_Core,4,1},
 #endif
 #if defined __i386__
-	{"shmat","GLIBC_2.0",0,LSB_Core,0,1},
+	{"shmat","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"shmat","GLIBC_2.0",0,LSB_Core,4,1},
@@ -14106,7 +14106,7 @@
 	{"tcsetpgrp","GLIBC_2.2.5",0,LSB_Core,4,1},
 #endif
 #if defined __i386__
-	{"tdelete","GLIBC_2.0",0,LSB_Core,0,1},
+	{"tdelete","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"tdelete","GLIBC_2.0",0,LSB_Core,4,1},
@@ -14178,7 +14178,7 @@
 	{"textdomain","GLIBC_2.2.5",0,LSB_Core,8,1},
 #endif
 #if defined __i386__
-	{"tfind","GLIBC_2.0",0,LSB_Core,0,1},
+	{"tfind","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"tfind","GLIBC_2.0",0,LSB_Core,4,1},
@@ -14448,7 +14448,7 @@
 	{"truncate64","GLIBC_2.2.5",0,LSB_Core,4,1},
 #endif
 #if defined __i386__
-	{"tsearch","GLIBC_2.0",0,LSB_Core,0,1},
+	{"tsearch","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"tsearch","GLIBC_2.0",0,LSB_Core,4,1},

=== modified file 'libchk/libdl_so_2.c'
--- a/libchk/libdl_so_2.c	2011-03-25 20:51:08 +0000
+++ b/libchk/libdl_so_2.c	2012-05-18 17:23:02 +0000
@@ -66,7 +66,7 @@
 	{"dlerror","GLIBC_2.2.5",0,LSB_Core,8,1},
 #endif
 #if defined __i386__
-	{"dlopen","GLIBC_2.1",0,LSB_Core,0,1},
+	{"dlopen","GLIBC_2.1",0,LSB_Core,4,1},
 #endif
 #if defined __ia64__
 	{"dlopen","GLIBC_2.1",0,LSB_Core,8,1},
@@ -87,7 +87,7 @@
 	{"dlopen","GLIBC_2.2.5",0,LSB_Core,8,1},
 #endif
 #if defined __i386__
-	{"dlsym","GLIBC_2.0",0,LSB_Core,0,1},
+	{"dlsym","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __ia64__
 	{"dlsym","GLIBC_2.0",0,LSB_Core,8,1},

=== modified file 'libchk/libgcc_s_so_1.c'
--- a/libchk/libgcc_s_so_1.c	2011-03-25 20:51:08 +0000
+++ b/libchk/libgcc_s_so_1.c	2012-05-18 17:23:02 +0000
@@ -45,7 +45,7 @@
 	{"_Unwind_DeleteException","GCC_3.0",0,LSB_Core,1,1},
 #endif
 #if defined __i386__
-	{"_Unwind_FindEnclosingFunction","GCC_3.3",0,LSB_Core,0,1},
+	{"_Unwind_FindEnclosingFunction","GCC_3.3",0,LSB_Core,4,1},
 #endif
 #if defined __ia64__
 	{"_Unwind_FindEnclosingFunction","GCC_3.3",0,LSB_Core,8,1},
@@ -189,7 +189,7 @@
 	{"_Unwind_GetIP","GCC_3.0",0,LSB_Core,8,1},
 #endif
 #if defined __i386__
-	{"_Unwind_GetLanguageSpecificData","GCC_3.0",0,LSB_Core,0,1},
+	{"_Unwind_GetLanguageSpecificData","GCC_3.0",0,LSB_Core,4,1},
 #endif
 #if defined __ia64__
 	{"_Unwind_GetLanguageSpecificData","GCC_3.0",0,LSB_Core,8,1},

=== modified file 'libchk/libpthread_so_0.c'
--- a/libchk/libpthread_so_0.c	2011-03-25 20:51:08 +0000
+++ b/libchk/libpthread_so_0.c	2012-05-18 17:23:02 +0000
@@ -1054,7 +1054,7 @@
 	{"pthread_getschedparam","GLIBC_2.2.5",0,LSB_Core,4,1},
 #endif
 #if defined __i386__
-	{"pthread_getspecific","GLIBC_2.0",0,LSB_Core,0,1},
+	{"pthread_getspecific","GLIBC_2.0",0,LSB_Core,4,1},
 #endif
 #if defined __ia64__
 	{"pthread_getspecific","GLIBC_2.2",0,LSB_Core,8,1},

=== modified file 'libchk/libstdcxx_so_6.c'
--- a/libchk/libstdcxx_so_6.c	2011-03-25 20:51:08 +0000
+++ b/libchk/libstdcxx_so_6.c	2012-05-18 17:23:02 +0000
@@ -14835,55 +14835,55 @@
 	{"_ZdlPv","GLIBCXX_3.4",0,LSB_Cpp,0,1},
 	{"_ZdlPvRKSt9nothrow_t","GLIBCXX_3.4",0,LSB_Cpp,0,1},
 #if defined __i386__
-	{"_Znaj","GLIBCXX_3.4",0,LSB_Cpp,0,1},
-#endif
-#if defined __powerpc__ && !defined __powerpc64__
-	{"_Znaj","GLIBCXX_3.4",0,LSB_Cpp,4,1},
-#endif
-#if defined __i386__
-	{"_ZnajRKSt9nothrow_t","GLIBCXX_3.4",0,LSB_Cpp,0,1},
-#endif
-#if defined __powerpc__ && !defined __powerpc64__
-	{"_ZnajRKSt9nothrow_t","GLIBCXX_3.4",0,LSB_Cpp,4,1},
-#endif
-#if defined __ia64__
-	{"_Znam","GLIBCXX_3.4",0,LSB_Cpp,0,1},
-#endif
-#if defined __powerpc64__
-	{"_Znam","GLIBCXX_3.4",0,LSB_Cpp,0,1},
-#endif
-#if defined __s390__ && !defined __s390x__
-	{"_Znam","GLIBCXX_3.4",0,LSB_Cpp,0,1},
-#endif
-#if defined __s390x__
-	{"_Znam","GLIBCXX_3.4",0,LSB_Cpp,0,1},
-#endif
-#if defined __x86_64__
-	{"_Znam","GLIBCXX_3.4",0,LSB_Cpp,0,1},
-#endif
-#if defined __ia64__
-	{"_ZnamRKSt9nothrow_t","GLIBCXX_3.4",0,LSB_Cpp,0,1},
-#endif
-#if defined __powerpc64__
-	{"_ZnamRKSt9nothrow_t","GLIBCXX_3.4",0,LSB_Cpp,0,1},
-#endif
-#if defined __s390__ && !defined __s390x__
-	{"_ZnamRKSt9nothrow_t","GLIBCXX_3.4",0,LSB_Cpp,0,1},
-#endif
-#if defined __s390x__
-	{"_ZnamRKSt9nothrow_t","GLIBCXX_3.4",0,LSB_Cpp,0,1},
-#endif
-#if defined __x86_64__
-	{"_ZnamRKSt9nothrow_t","GLIBCXX_3.4",0,LSB_Cpp,0,1},
-#endif
-#if defined __i386__
-	{"_Znwj","GLIBCXX_3.4",0,LSB_Cpp,0,1},
-#endif
-#if defined __powerpc__ && !defined __powerpc64__
-	{"_Znwj","GLIBCXX_3.4",0,LSB_Cpp,4,1},
-#endif
-#if defined __i386__
-	{"_ZnwjRKSt9nothrow_t","GLIBCXX_3.4",0,LSB_Cpp,0,1},
+	{"_Znaj","GLIBCXX_3.4",0,LSB_Cpp,4,1},
+#endif
+#if defined __powerpc__ && !defined __powerpc64__
+	{"_Znaj","GLIBCXX_3.4",0,LSB_Cpp,4,1},
+#endif
+#if defined __i386__
+	{"_ZnajRKSt9nothrow_t","GLIBCXX_3.4",0,LSB_Cpp,4,1},
+#endif
+#if defined __powerpc__ && !defined __powerpc64__
+	{"_ZnajRKSt9nothrow_t","GLIBCXX_3.4",0,LSB_Cpp,4,1},
+#endif
+#if defined __ia64__
+	{"_Znam","GLIBCXX_3.4",0,LSB_Cpp,0,1},
+#endif
+#if defined __powerpc64__
+	{"_Znam","GLIBCXX_3.4",0,LSB_Cpp,0,1},
+#endif
+#if defined __s390__ && !defined __s390x__
+	{"_Znam","GLIBCXX_3.4",0,LSB_Cpp,0,1},
+#endif
+#if defined __s390x__
+	{"_Znam","GLIBCXX_3.4",0,LSB_Cpp,0,1},
+#endif
+#if defined __x86_64__
+	{"_Znam","GLIBCXX_3.4",0,LSB_Cpp,0,1},
+#endif
+#if defined __ia64__
+	{"_ZnamRKSt9nothrow_t","GLIBCXX_3.4",0,LSB_Cpp,0,1},
+#endif
+#if defined __powerpc64__
+	{"_ZnamRKSt9nothrow_t","GLIBCXX_3.4",0,LSB_Cpp,0,1},
+#endif
+#if defined __s390__ && !defined __s390x__
+	{"_ZnamRKSt9nothrow_t","GLIBCXX_3.4",0,LSB_Cpp,0,1},
+#endif
+#if defined __s390x__
+	{"_ZnamRKSt9nothrow_t","GLIBCXX_3.4",0,LSB_Cpp,0,1},
+#endif
+#if defined __x86_64__
+	{"_ZnamRKSt9nothrow_t","GLIBCXX_3.4",0,LSB_Cpp,0,1},
+#endif
+#if defined __i386__
+	{"_Znwj","GLIBCXX_3.4",0,LSB_Cpp,4,1},
+#endif
+#if defined __powerpc__ && !defined __powerpc64__
+	{"_Znwj","GLIBCXX_3.4",0,LSB_Cpp,4,1},
+#endif
+#if defined __i386__
+	{"_ZnwjRKSt9nothrow_t","GLIBCXX_3.4",0,LSB_Cpp,4,1},
 #endif
 #if defined __powerpc__ && !defined __powerpc64__
 	{"_ZnwjRKSt9nothrow_t","GLIBCXX_3.4",0,LSB_Cpp,4,1},
@@ -14947,7 +14947,7 @@
 	{"__cxa_vec_new2","CXXABI_1.3",0,LSB_Cpp,0,1},
 	{"__cxa_vec_new3","CXXABI_1.3",0,LSB_Cpp,0,1},
 	{"__dynamic_cast","CXXABI_1.3",0,LSB_Cpp,0,1},
-	{"__gxx_personality_v0","CXXABI_1.3",0,LSB_Cpp,0,1},
+	{"__gxx_personality_v0","CXXABI_1.3",0,LSB_Cpp,4,1},
 	{0,0}};
 
 char *_N10__cxxabiv116__enum_type_infoE_of_libstdcxx_so_6_typeinfo_name[] = {

=== modified file 'libchk/mkfunclist'
--- a/libchk/mkfunclist	2011-03-25 20:51:08 +0000
+++ b/libchk/mkfunclist	2012-05-18 17:23:02 +0000
@@ -348,7 +348,7 @@
 {
 	$create = "CREATE TEMPORARY TABLE tmp_IncludedInts_$lsbversion ";
 	$create.= "(KEY `Lid`(`Lid`,`Iid`), KEY`Iid`(`Iid`,`AIarch`)) "; 
-	$create.= "SELECT Iid, Iname, Itype, Ireturn, AIarch, AIversion, LGlib AS Lid FROM Interface ";
+	$create.= "SELECT Iid, Iname, Itype, AIreturn, AIarch, AIversion, LGlib AS Lid FROM Interface ";
 	$create.= "LEFT JOIN ArchInt ON AIint=Iid ";
 	$create.= "LEFT JOIN LGInt on LGIint=AIint ";
 	$create.= "LEFT JOIN LibGroup ON LGid=LGIlibg ";
@@ -381,7 +381,7 @@
 $select = "SELECT * FROM tmp_IncludedInts_$lsbversion ";
 $select.= "LEFT JOIN Architecture ON Aid=AIarch ";
 $select.= "LEFT JOIN Version ON Vid=AIversion ";
-$select.= "LEFT JOIN ArchType ON ATtid=Ireturn AND ATaid=Aid ";
+$select.= "LEFT JOIN ArchType ON ATtid=AIreturn AND ATaid=Aid ";
 $select.= "LEFT JOIN SModLib ON SMLlid=Lid ";
 $select.= "LEFT JOIN SubModule ON SMLsmid=SMid ";
 $select.= "WHERE Lid=$lid ";



More information about the lsb-messages mailing list