2010-10-01 Benjamin Kosnik <bkoz@redhat.com>

	* scripts/extract_symvers: Add support for tracking TLS symbols.
	* testsuite/util/testsuite_abi.h (symbol::category): Add tls type.
	* testsuite/util/testsuite_abi.cc: Set symbol type to tls when
	appropriate, collect size info.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@164892 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f2938ed..e3c384d 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-01  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * scripts/extract_symvers: Add support for tracking TLS symbols.
+       * testsuite/util/testsuite_abi.h (symbol::category): Add tls type.
+       * testsuite/util/testsuite_abi.cc: Set symbol type to tls when
+       appropriate, collect size info.
+

 2010-10-01  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * scripts/extract_symvers: Use pvs if present.
 2010-10-01  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * scripts/extract_symvers: Use pvs if present.

diff --git a/libstdc++-v3/scripts/extract_symvers b/libstdc++-v3/scripts/extract_symvers
index 9eb7be5..a3e1584 100755 (executable)
--- a/libstdc++-v3/scripts/extract_symvers
+++ b/libstdc++-v3/scripts/extract_symvers
@@ -92,7 +92,7 @@ else
     egrep -v ' (LOCAL|UND) ' |\
     awk '{ if ($4 == "FUNC" || $4 == "NOTYPE")
              printf "%s:%s\n", $4, $8;
     egrep -v ' (LOCAL|UND) ' |\
     awk '{ if ($4 == "FUNC" || $4 == "NOTYPE")
              printf "%s:%s\n", $4, $8;

-           else if ($4 == "OBJECT")
+           else if ($4 == "OBJECT" || $4 == "TLS")

              printf "%s:%s:%s\n", $4, $3, $8;
          }' | sort | uniq > $tmp 2>&1
 #          else printf "Huh?  What is %s?\n", $8;
              printf "%s:%s:%s\n", $4, $3, $8;
          }' | sort | uniq > $tmp 2>&1
 #          else printf "Huh?  What is %s?\n", $8;

diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.cc b/libstdc++-v3/testsuite/util/testsuite_abi.cc
index d3c73f6..4921716 100644 (file)
--- a/libstdc++-v3/testsuite/util/testsuite_abi.cc
+++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc
@@ -43,13 +43,15 @@ symbol::init(string& data)
     type = symbol::function;
   else if (data.find("OBJECT") == 0)
     type = symbol::object;
     type = symbol::function;
   else if (data.find("OBJECT") == 0)
     type = symbol::object;

+  else if (data.find("TLS") == 0)
+    type = symbol::tls;

 
   n = data.find_first_of(delim);
   if (n != npos)
     data.erase(data.begin(), data.begin() + n + 1);
 
 
   n = data.find_first_of(delim);
   if (n != npos)
     data.erase(data.begin(), data.begin() + n + 1);
 

-  // Iff object, get size info.
-  if (type == symbol::object)
+  // Iff object or TLS, get size info.
+  if (type == symbol::object || type == symbol::tls)

     {
       n = data.find_first_of(delim);
       if (n != npos)
     {
       n = data.find_first_of(delim);
       if (n != npos)


@@ -130,6 +132,9 @@ symbol::print() const
     case object:
       type_string = "object";
       break;
     case object:
       type_string = "object";
       break;

+    case tls:
+      type_string = "tls";
+      break;

     case uncategorized:
       type_string = "uncategorized";
       break;
     case uncategorized:
       type_string = "uncategorized";
       break;


@@ -138,7 +143,7 @@ symbol::print() const
     }
   cout << "type: " << type_string << endl;
   
     }
   cout << "type: " << type_string << endl;
   

-  if (type == object)
+  if (type == object || type == tls)

     cout << "type size: " << size << endl;
 
   string status_string;
     cout << "type size: " << size << endl;
 
   string status_string;

diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.h b/libstdc++-v3/testsuite/util/testsuite_abi.h
index c9fe0a4..bff3990 100644 (file)
--- a/libstdc++-v3/testsuite/util/testsuite_abi.h
+++ b/libstdc++-v3/testsuite/util/testsuite_abi.h
@@ -29,7 +29,7 @@
 // Encapsulates symbol characteristics.
 struct symbol
 {
 // Encapsulates symbol characteristics.
 struct symbol
 {

-  enum category { function, object, uncategorized };
+  enum category { function, object, tls, uncategorized };

   enum designation { existing, added, subtracted, undesignated };
   enum version { none, compatible, incompatible, unversioned };
   enum compatibility 
   enum designation { existing, added, subtracted, undesignated };
   enum version { none, compatible, incompatible, unversioned };
   enum compatibility