diff options
| author | Jing Yu <jingyu@google.com> | 2012-02-15 15:40:16 -0800 |
|---|---|---|
| committer | Jing Yu <jingyu@google.com> | 2012-02-15 15:40:16 -0800 |
| commit | 3f73d6ef90458b45bbbb33ef4c2b174d4662a22d (patch) | |
| tree | 1b5f0d96c51b51168b3713058a1b62e92f1136eb /gcc-4.6/libgfortran/m4 | |
| parent | d7030123e04baab5dbff9c9ee04c0de99bd9a774 (diff) | |
| download | toolchain_gcc-3f73d6ef90458b45bbbb33ef4c2b174d4662a22d.tar.gz toolchain_gcc-3f73d6ef90458b45bbbb33ef4c2b174d4662a22d.tar.bz2 toolchain_gcc-3f73d6ef90458b45bbbb33ef4c2b174d4662a22d.zip | |
Sync down FSF r184235@google/gcc-4_6_2-mobile branch
1) Get mostly new patches from FSF gcc-4.6 branch
2) Fix PR52129
3) Insert GNU-stack note for all ARM targets
Change-Id: I2b9926981210e517e4021242908074319a91d6bd
Diffstat (limited to 'gcc-4.6/libgfortran/m4')
| -rw-r--r-- | gcc-4.6/libgfortran/m4/ifunction.m4 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gcc-4.6/libgfortran/m4/ifunction.m4 b/gcc-4.6/libgfortran/m4/ifunction.m4 index 72b05f45e..68e1c5e18 100644 --- a/gcc-4.6/libgfortran/m4/ifunction.m4 +++ b/gcc-4.6/libgfortran/m4/ifunction.m4 @@ -88,6 +88,7 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray, alloc_size = sizeof (rtype_name) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -95,8 +96,6 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { |