diff options
| author | rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-11-09 13:55:27 +0000 |
|---|---|---|
| committer | rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-11-09 13:55:27 +0000 |
| commit | 55af3bae674945beea2845ed091e5ea341e8aabf (patch) | |
| tree | c19ccfd35313d032491d5930dbdfaa3a8a2991cc /gcc/objc | |
| parent | 3a54beafaa08337dab2968b43ffc392b37cc9a71 (diff) | |
| parent | 5f35dd0e122d3aa3cccd4a32c912c25f60064ee6 (diff) | |
| download | gcc-55af3bae674945beea2845ed091e5ea341e8aabf.tar.gz | |
Merge with trunk.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/wide-int@204616 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/objc')
| -rw-r--r-- | gcc/objc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/objc/objc-act.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index f3fa0e06ded..e3be5f8d212 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,7 @@ +2013-11-07 Andrew MacLeod <amacleod@redhat.com> + + * objc-act.c (objc_push_parm): Handle atomic qualifier. + 2013-09-25 Tom Tromey <tromey@redhat.com> * Make-lang.in (START_HDRS, cc1obj-checksum.o, objc/objc-lang.o) diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index 3839f5e8ed6..112a7d1d65a 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -8229,6 +8229,7 @@ objc_push_parm (tree parm) c_apply_type_quals_to_decl ((TYPE_READONLY (TREE_TYPE (parm)) ? TYPE_QUAL_CONST : 0) | (TYPE_RESTRICT (TREE_TYPE (parm)) ? TYPE_QUAL_RESTRICT : 0) + | (TYPE_ATOMIC (TREE_TYPE (parm)) ? TYPE_QUAL_ATOMIC : 0) | (TYPE_VOLATILE (TREE_TYPE (parm)) ? TYPE_QUAL_VOLATILE : 0), parm); objc_parmlist = chainon (objc_parmlist, parm); |