From abaa8559b302f441f0cecaf6e2aa74d133d839d6 Mon Sep 17 00:00:00 2001 From: Bruce Korb Date: Thu, 2 May 2002 05:18:08 +0000 Subject: [PATCH] sync mainline to 3.1 From-SVN: r53034 --- gcc/ChangeLog | 6 ++++++ gcc/fixinc/check.tpl | 2 +- gcc/fixinc/inclhack.def | 2 +- gcc/fixinc/tests/base/assert.h | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 59a01f251b0..04e6b17b446 100644 --- 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 + + * 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 * pa.h (EXTRA_CONSTRAINT): Don't accept PIC addresses for the diff --git a/gcc/fixinc/check.tpl b/gcc/fixinc/check.tpl index fd03b3ea609..a241d18d0e8 100644 --- 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 0f1a2107649..764f621f885 100644 --- 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 45716a3b303..5140e892e3c 100644 --- 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 */