diff options
| author | Bruce Korb <bkorb@gnu.org> | 2002-05-02 05:18:08 +0000 |
|---|---|---|
| committer | Bruce Korb <korbb@gcc.gnu.org> | 2002-05-02 05:18:08 +0000 |
| commit | abaa8559b302f441f0cecaf6e2aa74d133d839d6 (patch) | |
| tree | 1c00aac1aa5084d22218550c3892a0be328e3570 /gcc | |
| parent | 76ccdb3c4a529e14d082a270366294ff29d1625b (diff) | |
| download | gcc-abaa8559b302f441f0cecaf6e2aa74d133d839d6.zip gcc-abaa8559b302f441f0cecaf6e2aa74d133d839d6.tar.gz gcc-abaa8559b302f441f0cecaf6e2aa74d133d839d6.tar.bz2 | |
sync mainline to 3.1
From-SVN: r53034
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fixinc/check.tpl | 2 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 2 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/assert.h | 5 |
4 files changed, 13 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 59a01f2..04e6b17 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 <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 fd03b3e..a241d18 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 0f1a210..764f621 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 45716a3..5140e89 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 */ |