pch.exp: Copy test header to the working directory before using it either for...

        * gcc.dg/pch/pch.exp: Copy test header to the working directory
        before using it either for precompilation or direct use.
        * gcc.dg/pch/*.hs: Rename from gcc.dg/pch/*.h.
        * gcc.dg/pch/*.c: Include foo.h, not foo.hp.

From-SVN: r61419

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 55e4028613fdceb910e57348b53a267acd21b942..c4f00625ae584e9a94eb77491a873b9a14d45796 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-16  Richard Henderson  <rth@redhat.com>
+
+       * gcc.dg/pch/pch.exp: Copy test header to the working directory
+       before using it either for precompilation or direct use.
+       * gcc.dg/pch/*.hs: Rename from gcc.dg/pch/*.h.
+       * gcc.dg/pch/*.c: Include foo.h, not foo.hp.
+
 2003-01-16  Mark Mitchell  <mark@codesourcery.com>
 
        * gcc/testsuite/g++.dg/ext/typename1.C: Add typename keyword.

diff --git a/gcc/testsuite/gcc.dg/pch/common-1.c b/gcc/testsuite/gcc.dg/pch/common-1.c
index dcf148a2a722f5c312b9994bbc4052310d3545a6..ec5731028534e2376721af61dd66ae6bad9e6a83 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/common-1.c
+++ b/gcc/testsuite/gcc.dg/pch/common-1.c
@@ -1,3 +1,3 @@
-#include "common-1.hp"
+#include "common-1.h"
 int foo2 = 3;
 int zz = 2;

diff --git a/gcc/testsuite/gcc.dg/pch/common-1.h b/gcc/testsuite/gcc.dg/pch/common-1.h
deleted file mode 100644 (file)
index 971e199..0000000
--- a/gcc/testsuite/gcc.dg/pch/common-1.h
+++ /dev/null
@@ -1,3 +0,0 @@
-static int foo1 = 9;
-int foo2;
-extern int zz;

diff --git a/gcc/testsuite/gcc.dg/pch/common-1.hs b/gcc/testsuite/gcc.dg/pch/common-1.hs
new file mode 100644 (file)
index 0000000..971e199
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pch/common-1.hs
@@ -0,0 +1,3 @@
+static int foo1 = 9;
+int foo2;
+extern int zz;

diff --git a/gcc/testsuite/gcc.dg/pch/cpp-1.c b/gcc/testsuite/gcc.dg/pch/cpp-1.c
index 43256cad5455d5fa27b5165769aba95cb210aefc..9a3d6700de38faa1a305a6de5252909bbb8a2574 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/cpp-1.c
+++ b/gcc/testsuite/gcc.dg/pch/cpp-1.c
@@ -1,4 +1,4 @@
-#include "cpp-1.hp"
+#include "cpp-1.h"
 #if !defined(__GNUC__)
 panic! panic!
 #endif

diff --git a/gcc/testsuite/gcc.dg/pch/cpp-1.h b/gcc/testsuite/gcc.dg/pch/cpp-1.h
deleted file mode 100644 (file)
index 6e25b02..0000000
--- a/gcc/testsuite/gcc.dg/pch/cpp-1.h
+++ /dev/null
@@ -1 +0,0 @@
-/* Empty.  */

diff --git a/gcc/testsuite/gcc.dg/pch/cpp-1.hs b/gcc/testsuite/gcc.dg/pch/cpp-1.hs
new file mode 100644 (file)
index 0000000..6e25b02
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pch/cpp-1.hs
@@ -0,0 +1 @@
+/* Empty.  */

diff --git a/gcc/testsuite/gcc.dg/pch/cpp-2.c b/gcc/testsuite/gcc.dg/pch/cpp-2.c
index b76c22cdb04bf4d598213da5aa0080dff32a5a79..aab84110e016f68b16239bd4652dce76aa69ee18 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/cpp-2.c
+++ b/gcc/testsuite/gcc.dg/pch/cpp-2.c
@@ -1,4 +1,4 @@
 /* { dg-options "-Wunknown-pragmas -I." } */
-#include "cpp-2.hp"
+#include "cpp-2.h"
 #pragma GCC poison not_used
 

diff --git a/gcc/testsuite/gcc.dg/pch/cpp-2.h b/gcc/testsuite/gcc.dg/pch/cpp-2.h
deleted file mode 100644 (file)
index 6e25b02..0000000
--- a/gcc/testsuite/gcc.dg/pch/cpp-2.h
+++ /dev/null
@@ -1 +0,0 @@
-/* Empty.  */

diff --git a/gcc/testsuite/gcc.dg/pch/cpp-2.hs b/gcc/testsuite/gcc.dg/pch/cpp-2.hs
new file mode 100644 (file)
index 0000000..6e25b02
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pch/cpp-2.hs
@@ -0,0 +1 @@
+/* Empty.  */

diff --git a/gcc/testsuite/gcc.dg/pch/decl-1.c b/gcc/testsuite/gcc.dg/pch/decl-1.c
index e4120704d9bb49ec2d81c221d25bac2c23ebe3bb..5d6bb1d4aaf6527e7374b6bccc3b91b55a46d103 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/decl-1.c
+++ b/gcc/testsuite/gcc.dg/pch/decl-1.c
@@ -1,2 +1,2 @@
-#include "decl-1.hp"
+#include "decl-1.h"
 int main(void) { return foo; }

diff --git a/gcc/testsuite/gcc.dg/pch/decl-1.h b/gcc/testsuite/gcc.dg/pch/decl-1.h
deleted file mode 100644 (file)
index 399f5d3..0000000
--- a/gcc/testsuite/gcc.dg/pch/decl-1.h
+++ /dev/null
@@ -1 +0,0 @@
-extern int foo;

diff --git a/gcc/testsuite/gcc.dg/pch/decl-1.hs b/gcc/testsuite/gcc.dg/pch/decl-1.hs
new file mode 100644 (file)
index 0000000..399f5d3
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pch/decl-1.hs
@@ -0,0 +1 @@
+extern int foo;

diff --git a/gcc/testsuite/gcc.dg/pch/decl-2.c b/gcc/testsuite/gcc.dg/pch/decl-2.c
index c374a17e3f77a354fa38fde514b81040fdadaa5f..72b6538b9322bed8f9319b395a27927f1c500d30 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/decl-2.c
+++ b/gcc/testsuite/gcc.dg/pch/decl-2.c
@@ -1,2 +1,2 @@
-#include "decl-2.hp"
+#include "decl-2.h"
 int main(void) { return fun (1, 2); }

diff --git a/gcc/testsuite/gcc.dg/pch/decl-2.h b/gcc/testsuite/gcc.dg/pch/decl-2.h
deleted file mode 100644 (file)
index 99c3726..0000000
--- a/gcc/testsuite/gcc.dg/pch/decl-2.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern int fun (int a, int b);
-
-

diff --git a/gcc/testsuite/gcc.dg/pch/decl-2.hs b/gcc/testsuite/gcc.dg/pch/decl-2.hs
new file mode 100644 (file)
index 0000000..99c3726
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pch/decl-2.hs
@@ -0,0 +1,3 @@
+extern int fun (int a, int b);
+
+

diff --git a/gcc/testsuite/gcc.dg/pch/decl-3.c b/gcc/testsuite/gcc.dg/pch/decl-3.c
index 9c95b9ad08efeaada04834978fddd7d2854225af..c12abbb1cf42a39bc423ec56841bc38bc36619d8 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/decl-3.c
+++ b/gcc/testsuite/gcc.dg/pch/decl-3.c
@@ -1,4 +1,4 @@
-#include "decl-3.hp"
+#include "decl-3.h"
 
 foo_p bar (void) 
 {

diff --git a/gcc/testsuite/gcc.dg/pch/decl-3.h b/gcc/testsuite/gcc.dg/pch/decl-3.h
deleted file mode 100644 (file)
index 787d480..0000000
--- a/gcc/testsuite/gcc.dg/pch/decl-3.h
+++ /dev/null
@@ -1,3 +0,0 @@
-struct foo;
-typedef struct foo *foo_p;
-extern foo_p foop;

diff --git a/gcc/testsuite/gcc.dg/pch/decl-3.hs b/gcc/testsuite/gcc.dg/pch/decl-3.hs
new file mode 100644 (file)
index 0000000..787d480
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pch/decl-3.hs
@@ -0,0 +1,3 @@
+struct foo;
+typedef struct foo *foo_p;
+extern foo_p foop;

diff --git a/gcc/testsuite/gcc.dg/pch/decl-4.c b/gcc/testsuite/gcc.dg/pch/decl-4.c
index 3efe3829ffcd722bbdb284f48b228a29f3f1a42e..61affdbc0c8abe6ade7ec1771649fa75d400dd1b 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/decl-4.c
+++ b/gcc/testsuite/gcc.dg/pch/decl-4.c
@@ -1,4 +1,4 @@
-#include "decl-4.hp"
+#include "decl-4.h"
 
 int bar (foo_p f)
 {

diff --git a/gcc/testsuite/gcc.dg/pch/decl-4.h b/gcc/testsuite/gcc.dg/pch/decl-4.h
deleted file mode 100644 (file)
index 3fb2200..0000000
--- a/gcc/testsuite/gcc.dg/pch/decl-4.h
+++ /dev/null
@@ -1,7 +0,0 @@
-typedef struct foo {
-  int a;
-  char b;
-  struct foo *c;
-} foo_s;
-typedef struct foo *foo_p;
-extern foo_p foop;

diff --git a/gcc/testsuite/gcc.dg/pch/decl-4.hs b/gcc/testsuite/gcc.dg/pch/decl-4.hs
new file mode 100644 (file)
index 0000000..3fb2200
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pch/decl-4.hs
@@ -0,0 +1,7 @@
+typedef struct foo {
+  int a;
+  char b;
+  struct foo *c;
+} foo_s;
+typedef struct foo *foo_p;
+extern foo_p foop;

diff --git a/gcc/testsuite/gcc.dg/pch/decl-5.c b/gcc/testsuite/gcc.dg/pch/decl-5.c
index f94b33a1363b00dbdd6ba8fb39c09be163f2ed55..705c2fe0df1df46102dc2d5a554af520b7b0405f 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/decl-5.c
+++ b/gcc/testsuite/gcc.dg/pch/decl-5.c
@@ -1,2 +1,2 @@
-#include "decl-5.hp"
+#include "decl-5.h"
 static int (*t)(void) = foo;

diff --git a/gcc/testsuite/gcc.dg/pch/decl-5.h b/gcc/testsuite/gcc.dg/pch/decl-5.h
deleted file mode 100644 (file)
index 914983c..0000000
--- a/gcc/testsuite/gcc.dg/pch/decl-5.h
+++ /dev/null
@@ -1 +0,0 @@
-extern int foo(void);

diff --git a/gcc/testsuite/gcc.dg/pch/decl-5.hs b/gcc/testsuite/gcc.dg/pch/decl-5.hs
new file mode 100644 (file)
index 0000000..914983c
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pch/decl-5.hs
@@ -0,0 +1 @@
+extern int foo(void);

diff --git a/gcc/testsuite/gcc.dg/pch/empty.c b/gcc/testsuite/gcc.dg/pch/empty.c
index 330876cc7c7558336e855e98bb440153a4220b9d..7daa7ca7fcd8fcc4c1f26e9d0f641c278767df0b 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/empty.c
+++ b/gcc/testsuite/gcc.dg/pch/empty.c
@@ -1,6 +1,6 @@
 /* Yes, it's called "empty" because it has no contents at all.  
    Even this comment goes here, rather than in empty.h.  */
-#include "empty.hp"
+#include "empty.h"
 
 int main(void) 
 {

diff --git a/gcc/testsuite/gcc.dg/pch/empty.h b/gcc/testsuite/gcc.dg/pch/empty.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/gcc/testsuite/gcc.dg/pch/empty.hs b/gcc/testsuite/gcc.dg/pch/empty.hs
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/testsuite/gcc.dg/pch/except-1.c b/gcc/testsuite/gcc.dg/pch/except-1.c
index 0332609de2da039facec4d94850f38130b3b68fb..f81b098d7d88111f91cf2f098a06708fdde52673 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/except-1.c
+++ b/gcc/testsuite/gcc.dg/pch/except-1.c
@@ -1,5 +1,5 @@
 /* { dg-options "-fexceptions -I." } */
-#include "except-1.hp"
+#include "except-1.h"
 
 int main(void) 
 {

diff --git a/gcc/testsuite/gcc.dg/pch/except-1.h b/gcc/testsuite/gcc.dg/pch/except-1.h
deleted file mode 100644 (file)
index 33a893d..0000000
--- a/gcc/testsuite/gcc.dg/pch/except-1.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* { dg-options "-fexceptions" } */
-extern inline int
-foo(int a)
-{
-  return a + 1;
-}

diff --git a/gcc/testsuite/gcc.dg/pch/except-1.hs b/gcc/testsuite/gcc.dg/pch/except-1.hs
new file mode 100644 (file)
index 0000000..33a893d
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pch/except-1.hs
@@ -0,0 +1,6 @@
+/* { dg-options "-fexceptions" } */
+extern inline int
+foo(int a)
+{
+  return a + 1;
+}

diff --git a/gcc/testsuite/gcc.dg/pch/global-1.c b/gcc/testsuite/gcc.dg/pch/global-1.c
index 4cab062345e3ea070570f118656b478af1be7d5e..c1cff5f1c53e25fc94abae6ecaeab099fc684b05 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/global-1.c
+++ b/gcc/testsuite/gcc.dg/pch/global-1.c
@@ -1,2 +1,2 @@
-#include "global-1.hp"
+#include "global-1.h"
 const int bar = 3;

diff --git a/gcc/testsuite/gcc.dg/pch/global-1.h b/gcc/testsuite/gcc.dg/pch/global-1.h
deleted file mode 100644 (file)
index 26efffc..0000000
--- a/gcc/testsuite/gcc.dg/pch/global-1.h
+++ /dev/null
@@ -1 +0,0 @@
-const int foo = 2;

diff --git a/gcc/testsuite/gcc.dg/pch/global-1.hs b/gcc/testsuite/gcc.dg/pch/global-1.hs
new file mode 100644 (file)
index 0000000..26efffc
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pch/global-1.hs
@@ -0,0 +1 @@
+const int foo = 2;

diff --git a/gcc/testsuite/gcc.dg/pch/inline-1.c b/gcc/testsuite/gcc.dg/pch/inline-1.c
index 7fc32d7f7663f1bb4aaf7d87b4b93a2e057d5057..38fad39c459c548b6bea745d7a08a98d15ac544e 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/inline-1.c
+++ b/gcc/testsuite/gcc.dg/pch/inline-1.c
@@ -1,4 +1,4 @@
-#include "inline-1.hp"
+#include "inline-1.h"
 int bar(int a, int b)
 {
   return foo(a) + b;

diff --git a/gcc/testsuite/gcc.dg/pch/inline-1.h b/gcc/testsuite/gcc.dg/pch/inline-1.h
deleted file mode 100644 (file)
index e8f1d6f..0000000
--- a/gcc/testsuite/gcc.dg/pch/inline-1.h
+++ /dev/null
@@ -1,5 +0,0 @@
-extern inline int
-foo(int a)
-{
-  return a * 2 + 1;
-}

diff --git a/gcc/testsuite/gcc.dg/pch/inline-1.hs b/gcc/testsuite/gcc.dg/pch/inline-1.hs
new file mode 100644 (file)
index 0000000..e8f1d6f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pch/inline-1.hs
@@ -0,0 +1,5 @@
+extern inline int
+foo(int a)
+{
+  return a * 2 + 1;
+}

diff --git a/gcc/testsuite/gcc.dg/pch/inline-2.c b/gcc/testsuite/gcc.dg/pch/inline-2.c
index 7792c828b929963910add10a51f65c6a4b53fd23..59b238a3b7a2efa3df06ac2190b2b13ac89eb005 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/inline-2.c
+++ b/gcc/testsuite/gcc.dg/pch/inline-2.c
@@ -1,4 +1,4 @@
-#include "inline-2.hp"
+#include "inline-2.h"
 extern inline char
 bar(int a)
 {

diff --git a/gcc/testsuite/gcc.dg/pch/inline-2.h b/gcc/testsuite/gcc.dg/pch/inline-2.h
deleted file mode 100644 (file)
index 7d90c63..0000000
--- a/gcc/testsuite/gcc.dg/pch/inline-2.h
+++ /dev/null
@@ -1,5 +0,0 @@
-extern inline const char *
-foo(int a)
-{
-  return "abcdefgh"+a;
-}

diff --git a/gcc/testsuite/gcc.dg/pch/inline-2.hs b/gcc/testsuite/gcc.dg/pch/inline-2.hs
new file mode 100644 (file)
index 0000000..7d90c63
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pch/inline-2.hs
@@ -0,0 +1,5 @@
+extern inline const char *
+foo(int a)
+{
+  return "abcdefgh"+a;
+}

diff --git a/gcc/testsuite/gcc.dg/pch/macro-1.c b/gcc/testsuite/gcc.dg/pch/macro-1.c
index 3775004a77b5dfcf5886774abf9e49bc4e43ff55..70546bb092dd9ef21d2ad8180fede525ac513348 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/macro-1.c
+++ b/gcc/testsuite/gcc.dg/pch/macro-1.c
@@ -1,4 +1,4 @@
-#include "macro-1.hp"
+#include "macro-1.h"
 
 int main(void) 
 {

diff --git a/gcc/testsuite/gcc.dg/pch/macro-1.h b/gcc/testsuite/gcc.dg/pch/macro-1.h
deleted file mode 100644 (file)
index 5d5b3f4..0000000
--- a/gcc/testsuite/gcc.dg/pch/macro-1.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define DEFINED_VALUE 3
-#define DEFINED_PARAM(x) (x+1)

diff --git a/gcc/testsuite/gcc.dg/pch/macro-1.hs b/gcc/testsuite/gcc.dg/pch/macro-1.hs
new file mode 100644 (file)
index 0000000..5d5b3f4
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pch/macro-1.hs
@@ -0,0 +1,2 @@
+#define DEFINED_VALUE 3
+#define DEFINED_PARAM(x) (x+1)

diff --git a/gcc/testsuite/gcc.dg/pch/macro-2.c b/gcc/testsuite/gcc.dg/pch/macro-2.c
index d058e2bb8698ebfa29f9dc5f191ebbefc47bf6dc..e2d965ff1e8bf2e5a8502467ddde34f973429bc4 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/macro-2.c
+++ b/gcc/testsuite/gcc.dg/pch/macro-2.c
@@ -1,6 +1,6 @@
 #define DEFINED_VALUE_2 3
 
-#include "macro-2.hp"
+#include "macro-2.h"
 
 int main(void) 
 {

diff --git a/gcc/testsuite/gcc.dg/pch/macro-2.h b/gcc/testsuite/gcc.dg/pch/macro-2.h
deleted file mode 100644 (file)
index 6152a84..0000000
--- a/gcc/testsuite/gcc.dg/pch/macro-2.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define DEFINED_VALUE 3
-

diff --git a/gcc/testsuite/gcc.dg/pch/macro-2.hs b/gcc/testsuite/gcc.dg/pch/macro-2.hs
new file mode 100644 (file)
index 0000000..6152a84
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pch/macro-2.hs
@@ -0,0 +1,2 @@
+#define DEFINED_VALUE 3
+

diff --git a/gcc/testsuite/gcc.dg/pch/macro-3.c b/gcc/testsuite/gcc.dg/pch/macro-3.c
index 40ee46e4f3aa05f10f1c1b944b3c14b4e8d4cc4a..493d954980bb3264b1a322538f2105f9921dc9d2 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/macro-3.c
+++ b/gcc/testsuite/gcc.dg/pch/macro-3.c
@@ -1,6 +1,6 @@
 #define DEFINED_FUNC_2(x) (3 + (x))
 
-#include "macro-3.hp"
+#include "macro-3.h"
 
 int main(void) 
 {

diff --git a/gcc/testsuite/gcc.dg/pch/macro-3.h b/gcc/testsuite/gcc.dg/pch/macro-3.h
deleted file mode 100644 (file)
index d394792..0000000
--- a/gcc/testsuite/gcc.dg/pch/macro-3.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define DEFINED_FUNC(x) 3 - (x)
-

diff --git a/gcc/testsuite/gcc.dg/pch/macro-3.hs b/gcc/testsuite/gcc.dg/pch/macro-3.hs
new file mode 100644 (file)
index 0000000..d394792
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pch/macro-3.hs
@@ -0,0 +1,2 @@
+#define DEFINED_FUNC(x) 3 - (x)
+

diff --git a/gcc/testsuite/gcc.dg/pch/pch.exp b/gcc/testsuite/gcc.dg/pch/pch.exp
index 69422ca3ef04fa391c8943f6b6e64c9f0864f605..746e8f9601856ee722f4db843472d582a6a2a036 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/pch.exp
+++ b/gcc/testsuite/gcc.dg/pch/pch.exp
@@ -36,11 +36,10 @@ foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.c]] {
     set nshort [file tail [file dirname $test]]/[file tail $test]
     set bname "[file rootname [file tail $test]]"
 
-    catch { file delete "$bname.hp.pch" }
     catch { file delete "$bname.h.pch" }
+    catch { file delete "$bname.h" }
     catch { file delete "$bname.s" }
     catch { file delete "$bname.s-pch" }
-    catch { file delete "$bname.hp" }
 
     # We don't try to use the loop-optimizing options, since they are highly
     # unlikely to make any difference to PCH.
@@ -49,30 +48,22 @@ foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.c]] {
 
        # For the header files, the default is to precompile.
        set dg-do-what-default precompile
-       dg-test -keep-output "[file rootname $test].h" $flags ""
+       file copy "[file rootname $test].hs" "$bname.h"
+       dg-test -keep-output "$bname.h" $flags ""
 
        # For the rest, the default is to compile to .s.
        set dg-do-what-default compile
 
        if { [ file exists "$bname.h.pch" ] } {
-           # To ensure that the PCH is used, not the original header,
-           # the actual PCH file is renamed to "<foo>.hp.pch".
-           file rename "$bname.h.pch" "$bname.hp.pch"
-           if { [ is_remote host ] } {
-               remote_download host "$bname.hp.pch"
-           }
+           # Ensure that the PCH file is used, not the original header.
+           file delete "$bname.h"
 
            dg-test -keep-output $test $flags "-I."
-           file delete "$bname.hp.pch"
+           file delete "$bname.h.pch"
            if { [ file exists "$bname.s" ] } {
                file rename "$bname.s" "$bname.s-pch"
-               if { [ is_remote host ] } {
-                   remote_upload host "[file rootname $test].h" "$bname.hp"
-               } else {
-                   file copy "[file rootname $test].h" "$bname.hp"
-               }
+               file copy "[file rootname $test].hs" "$bname.h"
                dg-test -keep-output $test $flags "-I."
-               remote_file host delete "$bname.hp"
                set tmp [ diff "$bname.s" "$bname.s-pch" ]
                if { $tmp == 0 } {
                    untested "$nshort $flags assembly comparison"
@@ -81,6 +72,7 @@ foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.c]] {
                } else {
                    fail "$nshort $flags assembly comparison"
                }
+               file delete "$bname.h"
                file delete "$bname.s"
                file delete "$bname.s-pch"
            } else {

diff --git a/gcc/testsuite/gcc.dg/pch/static-1.c b/gcc/testsuite/gcc.dg/pch/static-1.c
index c1816e949b4cf68c55de29b2cb6f25be14ab8113..33a139120455dac7021e3d1f750d865f2952e105 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/static-1.c
+++ b/gcc/testsuite/gcc.dg/pch/static-1.c
@@ -1,4 +1,4 @@
-#include "static-1.hp"
+#include "static-1.h"
 static int bar(void)
 {
   static int counter;

diff --git a/gcc/testsuite/gcc.dg/pch/static-1.h b/gcc/testsuite/gcc.dg/pch/static-1.h
deleted file mode 100644 (file)
index 08cc439..0000000
--- a/gcc/testsuite/gcc.dg/pch/static-1.h
+++ /dev/null
@@ -1,5 +0,0 @@
-static int foo(void)
-{
-  static int counter;
-  return counter++;
-}

diff --git a/gcc/testsuite/gcc.dg/pch/static-1.hs b/gcc/testsuite/gcc.dg/pch/static-1.hs
new file mode 100644 (file)
index 0000000..08cc439
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pch/static-1.hs
@@ -0,0 +1,5 @@
+static int foo(void)
+{
+  static int counter;
+  return counter++;
+}

diff --git a/gcc/testsuite/gcc.dg/pch/static-2.c b/gcc/testsuite/gcc.dg/pch/static-2.c
index afda874e279f9cbf2319cbdf2db6af8be7b4bbc1..23e9af1267902128a2bce2608cae0511e7c1a8c9 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/static-2.c
+++ b/gcc/testsuite/gcc.dg/pch/static-2.c
@@ -1,4 +1,4 @@
-#include "static-2.hp"
+#include "static-2.h"
 int bar(void)
 {
   static int counter;

diff --git a/gcc/testsuite/gcc.dg/pch/static-2.h b/gcc/testsuite/gcc.dg/pch/static-2.h
deleted file mode 100644 (file)
index 08cc439..0000000
--- a/gcc/testsuite/gcc.dg/pch/static-2.h
+++ /dev/null
@@ -1,5 +0,0 @@
-static int foo(void)
-{
-  static int counter;
-  return counter++;
-}

diff --git a/gcc/testsuite/gcc.dg/pch/static-2.hs b/gcc/testsuite/gcc.dg/pch/static-2.hs
new file mode 100644 (file)
index 0000000..08cc439
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pch/static-2.hs
@@ -0,0 +1,5 @@
+static int foo(void)
+{
+  static int counter;
+  return counter++;
+}

diff --git a/gcc/testsuite/gcc.dg/pch/system-1.c b/gcc/testsuite/gcc.dg/pch/system-1.c
index 096fe593e06baf5d64bd0acd36ccd19c13dbc288..9fde1365d5443b7a4c0843f197334d970cce40ad 100644 (file)
--- a/gcc/testsuite/gcc.dg/pch/system-1.c
+++ b/gcc/testsuite/gcc.dg/pch/system-1.c
@@ -1,4 +1,4 @@
-#include "system-1.hp"
+#include "system-1.h"
 int main(void)
 {
   puts ("hello world!");

diff --git a/gcc/testsuite/gcc.dg/pch/system-1.h b/gcc/testsuite/gcc.dg/pch/system-1.h
deleted file mode 100644 (file)
index fbfff34..0000000
--- a/gcc/testsuite/gcc.dg/pch/system-1.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>

diff --git a/gcc/testsuite/gcc.dg/pch/system-1.hs b/gcc/testsuite/gcc.dg/pch/system-1.hs
new file mode 100644 (file)
index 0000000..fbfff34
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pch/system-1.hs
@@ -0,0 +1,2 @@
+#include <stdio.h>
+#include <stdlib.h>