diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3cbb7a9c7c5616c4d6490f52b03661aa45512cd7..30e0dad1da2d08d646179422dc626df105f919c3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-08  Steve Ellcey  <sje@cup.hp.com>
+
+	* gcc/testsuite/g++.dg/abi/covariant1.C: Fix scan-assembler.
+	* gcc/testsuite/g++.dg/abi/covariant6.C: Ditto.
+
 2010-11-08  Kai Tietz  <kai.tietz@onevision.com>
 
         PR target/28627
diff --git a/gcc/testsuite/g++.dg/abi/covariant1.C b/gcc/testsuite/g++.dg/abi/covariant1.C
index ae8c5e603da70ffe862f62500a720ec8f1a65d9f..97737ddb94ce6a6e0f91ba4e9beddd13d7210876 100644
--- a/gcc/testsuite/g++.dg/abi/covariant1.C
+++ b/gcc/testsuite/g++.dg/abi/covariant1.C
@@ -20,7 +20,7 @@ struct c14 :
 
 void c14::f() { }
 
-// { dg-final { scan-assembler "_ZTcv0_n12_v0_n16_N3c143f17Ev" { target ilp32 } } }
+// { dg-final { scan-assembler "_ZTcv0_n12_v0_n16_N3c143f17Ev" { target { ilp32  && { ! { ia64-*-hpux* } } } } } }
 // { dg-final { scan-assembler-not "_ZTch0_v0_n16_N3c143f17Ev" } }
-// { dg-final { scan-assembler "_ZTcv0_n24_v0_n32_N3c143f17Ev" { target lp64 } } }
+// { dg-final { scan-assembler "_ZTcv0_n24_v0_n32_N3c143f17Ev" { target { lp64  || { ia64-*-hpux* } } } } }
 // { dg-final { scan-assembler-not "_ZTch0_v0_n32_N3c143f17Ev" } }
diff --git a/gcc/testsuite/g++.dg/abi/covariant6.C b/gcc/testsuite/g++.dg/abi/covariant6.C
index 9dfc5ba74ab9f6a786a0e2ff98ed111ab913f877..143b4ad36cbbcaf07e70ae187f23a67577702486 100644
--- a/gcc/testsuite/g++.dg/abi/covariant6.C
+++ b/gcc/testsuite/g++.dg/abi/covariant6.C
@@ -16,10 +16,10 @@ struct C: B
 C* C::f() { return 0; }
 
 // When we emit C::f, we should emit both thunks: one for B and one for A.
-// { dg-final { scan-assembler "_ZTch0_v0_n16_N1C1fEv" { target ilp32 } } }
-// { dg-final { scan-assembler "_ZTch0_v0_n32_N1C1fEv" { target lp64 } } }
-// { dg-final { scan-assembler "_ZTcv0_n12_v0_n16_N1C1fEv" { target ilp32 } } }
-// { dg-final { scan-assembler "_ZTcv0_n24_v0_n32_N1C1fEv" { target lp64 } } }
+// { dg-final { scan-assembler "_ZTch0_v0_n16_N1C1fEv" { target { ilp32  && { ! { ia64-*-hpux* } } } } } }
+// { dg-final { scan-assembler "_ZTch0_v0_n32_N1C1fEv" { target { lp64  || { ia64-*-hpux* } } } } }
+// { dg-final { scan-assembler "_ZTcv0_n12_v0_n16_N1C1fEv" { target { ilp32  && { ! { ia64-*-hpux* } } } } } }
+// { dg-final { scan-assembler "_ZTcv0_n24_v0_n32_N1C1fEv" { target { lp64  || { ia64-*-hpux* } } } } }
 
 struct D: B
 {
@@ -30,5 +30,5 @@ struct D: B
 void D::dummy() { }
 
 // When we emit the D vtable, it should refer to the thunk for B.
-// { dg-final { scan-assembler "_ZTch0_v0_n16_N1D1fEv" { target ilp32 } } }
-// { dg-final { scan-assembler "_ZTch0_v0_n32_N1D1fEv" { target lp64 } } }
+// { dg-final { scan-assembler "_ZTch0_v0_n16_N1D1fEv" { target { ilp32  && { ! { ia64-*-hpux* } } } } } }
+// { dg-final { scan-assembler "_ZTch0_v0_n32_N1D1fEv" { target { lp64  || { ia64-*-hpux* } } } } }