From 3f73d6ef90458b45bbbb33ef4c2b174d4662a22d Mon Sep 17 00:00:00 2001 From: Jing Yu Date: Wed, 15 Feb 2012 15:40:16 -0800 Subject: 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 --- gcc-4.6/libgfortran/generated/maxloc1_8_r4.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gcc-4.6/libgfortran/generated/maxloc1_8_r4.c') diff --git a/gcc-4.6/libgfortran/generated/maxloc1_8_r4.c b/gcc-4.6/libgfortran/generated/maxloc1_8_r4.c index 97ef902d9..584bdb81f 100644 --- a/gcc-4.6/libgfortran/generated/maxloc1_8_r4.c +++ b/gcc-4.6/libgfortran/generated/maxloc1_8_r4.c @@ -101,6 +101,7 @@ maxloc1_8_r4 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * 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. */ @@ -108,8 +109,6 @@ maxloc1_8_r4 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { -- cgit v1.2.3