From ba0dcc87bece9b118fb6cc3ff2261be4901faabf Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@cygnus.com>
Date: Thu, 8 Oct 1998 18:17:00 +0000
Subject: [PATCH] * gcc.dg/dll-?.c Add thumb to target list.

        Fix assembler scan patterns to match current assembler output.

From-SVN: r22931
---
 gcc/testsuite/ChangeLog      | 5 +++++
 gcc/testsuite/gcc.dg/dll-1.c | 3 ++-
 gcc/testsuite/gcc.dg/dll-2.c | 1 +
 gcc/testsuite/gcc.dg/dll-3.c | 1 +
 gcc/testsuite/gcc.dg/dll-4.c | 3 ++-
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fc85ca17c64..bcea5123556 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct  8 19:14:05 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* gcc.dg/dll-?.c Add thumb to target list.
+	Fix assembler scan patterns to match current assembler output.
+
 1998-10-08  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
 	* g++.old-deja/g++.pt/expr6.C: New test.  operator?: breaks
diff --git a/gcc/testsuite/gcc.dg/dll-1.c b/gcc/testsuite/gcc.dg/dll-1.c
index 72c6ba5b24e..eb3b9b867f0 100644
--- a/gcc/testsuite/gcc.dg/dll-1.c
+++ b/gcc/testsuite/gcc.dg/dll-1.c
@@ -1,9 +1,10 @@
 /* { dg-do compile { target arm*-*-pe* } } */
+/* { dg-do compile { target thumb*-*-pe* } } */
 /* { dg-options -mno-nop-fun-dllimport } */
 
 __declspec (dllimport) void imp ();
 
 __declspec (dllexport) void exp () { imp (); }
 
-/* { dg-final { scan-assembler dll-1.c "__imp_imp.*\.section\[ \t\]*.drectve\n\[^\n\]*-export:exp" } } */
+/* { dg-final { scan-assembler dll-1.c "\.section\[ \t\]*.drectve\n\[^\n\]*-export:exp.*__imp_imp" } } */
 /* { dg-final { scan-assembler-not dll-1.c "__imp_exp" } } */
diff --git a/gcc/testsuite/gcc.dg/dll-2.c b/gcc/testsuite/gcc.dg/dll-2.c
index e49f6e2027d..c55e9209359 100644
--- a/gcc/testsuite/gcc.dg/dll-2.c
+++ b/gcc/testsuite/gcc.dg/dll-2.c
@@ -9,6 +9,7 @@
    and functions.  In C++, it only works for functions.  */
 
 /* { dg-do compile { target arm*-*-pe* } } */
+/* { dg-do compile { target thumb*-*-pe* } } */
 
 __declspec (dllimport) int foo1 ();
 __declspec (dllexport) int foo1 ();
diff --git a/gcc/testsuite/gcc.dg/dll-3.c b/gcc/testsuite/gcc.dg/dll-3.c
index 4976ebbbcc6..0f7818f1e5c 100644
--- a/gcc/testsuite/gcc.dg/dll-3.c
+++ b/gcc/testsuite/gcc.dg/dll-3.c
@@ -1,6 +1,7 @@
 /* Ensure dllexport overrides dllimport.  */
 
 /* { dg-do compile { target arm*-*-pe* } } */
+/* { dg-do compile { target thumb*-*-pe* } } */
 
 __declspec (dllimport) int foo1 ();
 __declspec (dllexport) int foo1 ();
diff --git a/gcc/testsuite/gcc.dg/dll-4.c b/gcc/testsuite/gcc.dg/dll-4.c
index ae617861951..b708790baa5 100644
--- a/gcc/testsuite/gcc.dg/dll-4.c
+++ b/gcc/testsuite/gcc.dg/dll-4.c
@@ -1,4 +1,5 @@
 /* { dg-do compile { target arm*-*-pe* } } */
+/* { dg-do compile { target thumb*-*-pe* } } */
 
 __declspec (dllimport) int foo1;
 int foo1;
@@ -9,5 +10,5 @@ int foo2 = 5;
 int f () { return foo1 + foo2; }
 
 /* FIXME: We should scan the output of nm for this case.  */
-/* { dg-final { scan-assembler dll-4.c "(\.comm\[ \t\]*foo1.*\nfoo2:|\nfoo2:.*\.comm\[ \t\]*foo1)" } } */
+/* { dg-final { scan-assembler dll-4.c "(foo2:.*\.comm\[ \t_\]*foo1)" } } */
 /* { dg-final { scan-assembler-not dll-4.c "__imp_" } } */