sync mainline to 3.1

From-SVN: r53034

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 59a01f251b01cb11655c8aedaf989ea308dea52f..04e6b17b44612a5e8e6a15bd70f60b5ecc90a4d0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -5,6 +5,12 @@
         * config/rs6000/rs6000.c (rs6000_legitimate_address): Disallow
         PRE_INC and PRE_DEC for altivec modes.
 
+2002-05-01  Bruce Korb  <bkorb@gnu.org>
+
+       * fixinc/check.tpl(set-writable): make sure the function exists first
+       * fixinc/inclhack.def(alpha_assert): fix test_text
+       * fixinc/tests/base/assert.h: add in missing result
+
 2002-05-01  Jeff Law  <law@redhat.com>
 
        * pa.h (EXTRA_CONSTRAINT): Don't accept PIC addresses for the

diff --git a/gcc/fixinc/check.tpl b/gcc/fixinc/check.tpl
index fd03b3ea60989084d1070e1b353d85865a4a487d..a241d18d0e891b70cd1c1d1d715fd8b61b863fd1 100644 (file)
--- a/gcc/fixinc/check.tpl
+++ b/gcc/fixinc/check.tpl
@@ -171,6 +171,6 @@ else
 fi
 $exitok[=
 
-(set-writable)
+(if (defined? 'set-writable) (set-writable))
 
 =]

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 0f1a210764906e3884595ad1843d91d752abc862..764f621f88580797b48854916266363d662f8b00 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -2089,7 +2089,7 @@ fix = {
     select   = '__cplusplus < 54321L';
     sed      = 's/defined(__cplusplus) && (__cplusplus < 54321L)/0/';
 
-    test_text = '#if\tdefined(__cplusplus) && (__cplusplus < 54321L)';
+    test_text = "#if\tdefined(__cplusplus) && (__cplusplus < 54321L)";
 };
 
 /*

diff --git a/gcc/fixinc/tests/base/assert.h b/gcc/fixinc/tests/base/assert.h
index 45716a3b3032ef513e60732860c9acee441b6f14..5140e892e3c779fbc62c63cbf7a22684ae493cd7 100644 (file)
--- a/gcc/fixinc/tests/base/assert.h
+++ b/gcc/fixinc/tests/base/assert.h
@@ -24,6 +24,11 @@ extern void __assert(const char *, const char *, int);
 #endif  /* ALPHA___ASSERT_CHECK */
 
 
+#if defined( ALPHA_ASSERT_CHECK )
+#define assert(EX) ((EX) ? (void)0 : __assert(#EX, __FILE__, __LINE__))
+#endif  /* ALPHA_ASSERT_CHECK */
+
+
 #if defined( BROKEN_ASSERT_STDIO_CHECK )
 extern FILE* stderr;
 #endif  /* BROKEN_ASSERT_STDIO_CHECK */