2004-06-30 Michael Chastain <mec.gnu@mindspring.com>

	* lib/compiler.cc: Work around string preprocessing problem
	with old hp c++ compiler.
	* lib/compiler.c: Likewise.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 211adad751ef0643d36cfbaa4542913357f7ef0f..bf936bf28731dadc1208c21fe4c85ad0bee80d80 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-30  Michael Chastain   <mec.gnu@mindspring.com>
+
+       * lib/compiler.cc: Work around string preprocessing problem
+       with old hp c++ compiler.
+       * lib/compiler.c: Likewise.
+
 2004-06-29  Corinna Vinschen  <vinschen@redhat.com>
 
        * gdb.arch/i386-prologue.c: Add copyright header.  Use preprocessor

diff --git a/gdb/testsuite/lib/compiler.c b/gdb/testsuite/lib/compiler.c
index 47b376f12cfd60d4eaf25ca8b4e96c5faed045bc..1cc5d7397ad3137eac58c254a7bf249eac3c088b 100644 (file)
--- a/gdb/testsuite/lib/compiler.c
+++ b/gdb/testsuite/lib/compiler.c
@@ -34,7 +34,14 @@
 
    TODO: purge signed_keyword_not_used.  */
 
-set compiler_info "unknown"
+/* Note the semicolon at the end of this line.  Older versions of
+   hp c++ have a bug in string preprocessing: if the last token on a
+   line is a string, then the preprocessor concatenates the next line
+   onto the current line and eats the newline!  That messes up TCL of
+   course.  That happens with HP aC++ A.03.13, but it no longer happens
+   with HP aC++ A.03.45. */
+
+set compiler_info "unknown" ;
 
 #if defined (__GNUC__)
 #if defined (__GNUC_PATCHLEVEL__)

diff --git a/gdb/testsuite/lib/compiler.cc b/gdb/testsuite/lib/compiler.cc
index 72b9dc1d22a9ec6ba355a1d3a08c0b73f15a5848..fdf1ab5478b78fa90531bbb08b8d12e7499bb666 100644 (file)
--- a/gdb/testsuite/lib/compiler.cc
+++ b/gdb/testsuite/lib/compiler.cc
@@ -22,7 +22,14 @@
 /* This file is exactly like compiler.c.  I could just use compiler.c if
    I could be sure that every C++ compiler accepted extensions of ".c".  */
 
-set compiler_info "unknown"
+/* Note the semicolon at the end of this line.  Older versions of
+   hp c++ have a bug in string preprocessing: if the last token on a
+   line is a string, then the preprocessor concatenates the next line
+   onto the current line and eats the newline!  That messes up TCL of
+   course.  That happens with HP aC++ A.03.13, but it no longer happens
+   with HP aC++ A.03.45. */
+
+set compiler_info "unknown" ;
 
 #if defined (__GNUC__)
 #if defined (__GNUC_PATCHLEVEL__)