conformtest: Remove duplicate typed-constant handling.

diff --git a/ChangeLog b/ChangeLog
index d3bd409..677bf37 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-28  Joseph Myers  <joseph@codesourcery.com>
+
+       * conform/conformtest.pl: Remove duplicate typed-constant
+       handling.
+
 2012-04-28  David S. Miller  <davem@davemloft.net>
 
        * Makerules (%.abilist): Add vpath on sysdep_dirs.

diff --git a/conform/conformtest.pl b/conform/conformtest.pl
index 2962e55..8b95186 100644 (file)
--- a/conform/conformtest.pl
+++ b/conform/conformtest.pl
@@ -620,48 +620,6 @@ while ($#headers >= 0) {
        $res = runtest ($fnamebase, "Testing for value of symbol $symbol",
                        "Symbol \"$symbol\" has not the right value.", $res);
       }
-    } elsif (/^typed-constant *([a-zA-Z0-9_]*) *({([^}]*)}|([^ ]*)) *([A-Za-z0-9_-]*)?/) {
-      my($const) = $1;
-      my($type) = "$3$4";
-      my($value) = $5;
-      my($res) = $missing;
-
-      # Remember that this name is allowed.
-      push @allow, $const;
-
-      # Generate a program to test for the availability of this constant.
-      open (TESTFILE, ">$fnamebase.c");
-      print TESTFILE "$prepend";
-      print TESTFILE "#include <$h>\n";
-      print TESTFILE "__typeof__ ($const) a = $const;\n";
-      close (TESTFILE);
-
-      $res = compiletest ($fnamebase, "Testing for constant $const",
-                         "Constant \"$const\" not available.", $res, 0);
-
-      # Test the types of the members.
-      open (TESTFILE, ">$fnamebase.c");
-      print TESTFILE "$prepend";
-      print TESTFILE "#include <$h>\n";
-      print TESTFILE "__typeof__ (($type) 0) a;\n";
-      print TESTFILE "extern __typeof__ ($const) a;\n";
-      close (TESTFILE);
-
-      compiletest ($fnamebase, "Testing for type of constant $const",
-                  "Constant \"$const\" does not have the correct type.",
-                  $res, 0);
-
-      if ($value ne "") {
-       # Generate a program to test for the value of this constant.
-       open (TESTFILE, ">$fnamebase.c");
-       print TESTFILE "$prepend";
-       print TESTFILE "#include <$h>\n";
-       print TESTFILE "int main (void) { return $const != $value; }\n";
-       close (TESTFILE);
-
-       $res = runtest ($fnamebase, "Testing for value of constant $const",
-                       "Constant \"$const\" has not the right value.", $res);
-      }
     } elsif (/^optional-type *({([^}]*)|([a-zA-Z0-9_]*))/) {
       my($type) = "$2$3";
       my($maybe_opaque) = 0;