diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 548d7d42f41bc34f4c12c95221de49a992e83802..4de2e4b05099c07199bbc3623c516fc4c0c3cc8a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-19  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* g++.dg/parse/attr-ctor1.C: XFAIL on hppa.
+	* g++.dg/opt/template1.C: Robustify assembler regexp
+
 2004-02-19  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
 	* gcc.c-torture/execute/simd-4.x: Remove.
diff --git a/gcc/testsuite/g++.dg/opt/template1.C b/gcc/testsuite/g++.dg/opt/template1.C
index 9003be1ee17eff920285551a8dae55a00bc11877..f25434693918927f3be7ad92e3f00707f7258f54 100644
--- a/gcc/testsuite/g++.dg/opt/template1.C
+++ b/gcc/testsuite/g++.dg/opt/template1.C
@@ -1,5 +1,5 @@
 // { dg-options "-O2" }
-// { dg-final { scan-assembler-not "foo1" } }
+// { dg-final { scan-assembler-not "\n_?_ZN1AILi0EE4foo1Ev\[: \t\n\]" } }
 
 template <int>
 struct A {
diff --git a/gcc/testsuite/g++.dg/parse/attr-ctor1.C b/gcc/testsuite/g++.dg/parse/attr-ctor1.C
index 4f8cd1dde664eac96898b8461e62608c1979d9c8..d48543cf100ecc53e214986a89498c2b7cc2d011 100644
--- a/gcc/testsuite/g++.dg/parse/attr-ctor1.C
+++ b/gcc/testsuite/g++.dg/parse/attr-ctor1.C
@@ -2,7 +2,9 @@
 // Origin: <petr@scssoft.com>
 // { dg-do compile }
 
+// Requires section attribute support
+
 class A
 {
-    __attribute__((section("whatever"))) A();
+    __attribute__((section("whatever"))) A(); // { dg-bogus "" "" { xfail hppa*-*-hpux* } }
 };