diff options
| author | Roger Sayle <roger@eyesopen.com> | 2003-03-10 23:28:08 +0000 |
|---|---|---|
| committer | Roger Sayle <sayle@gcc.gnu.org> | 2003-03-10 23:28:08 +0000 |
| commit | f75b407f9047bf2ef19bb1303c5e9eef34e7cc12 (patch) | |
| tree | a0717de52cc663b6a321c2504f00b7ab694c3503 /gcc | |
| parent | 2d8d15b76293051e139149bf567846f1798fe2d0 (diff) | |
| download | gcc-f75b407f9047bf2ef19bb1303c5e9eef34e7cc12.zip gcc-f75b407f9047bf2ef19bb1303c5e9eef34e7cc12.tar.gz gcc-f75b407f9047bf2ef19bb1303c5e9eef34e7cc12.tar.bz2 | |
* com.c (duplicate_decls): Synchronize with C's duplicate_decls.
From-SVN: r64142
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/f/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/f/com.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog index 53216b8..25d34a7 100644 --- a/gcc/f/ChangeLog +++ b/gcc/f/ChangeLog @@ -1,3 +1,7 @@ +2003-03-10 Roger Sayle <roger@eyesopen.com> + + * com.c (duplicate_decls): Synchronize with C's duplicate_decls. + Sat Mar 8 21:11:40 2003 Neil Booth <neil@daikokuya.co.uk> * com.c (ffe_init): Update prototype; move code to ffe_post_options. diff --git a/gcc/f/com.c b/gcc/f/com.c index 9c71841..0895485 100644 --- a/gcc/f/com.c +++ b/gcc/f/com.c @@ -1,5 +1,5 @@ /* com.c -- Implementation File (module.c template V1.0) - Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by James Craig Burley. @@ -13220,9 +13220,6 @@ duplicate_decls (tree newdecl, tree olddecl) COPY_DECL_RTL (olddecl, newdecl); /* Merge the type qualifiers. */ - if (DECL_BUILT_IN_NONANSI (olddecl) && TREE_THIS_VOLATILE (olddecl) - && !TREE_THIS_VOLATILE (newdecl)) - TREE_THIS_VOLATILE (olddecl) = 0; if (TREE_READONLY (newdecl)) TREE_READONLY (olddecl) = 1; if (TREE_THIS_VOLATILE (newdecl)) |