diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-09-03 15:56:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-03 15:56:31 +0000 |
| commit | 4254ad78d813b8c4cfc6c07218aee6b1be554f23 (patch) | |
| tree | 8e9350d7e0339c5c7da9499ab5742527e21520c6 /gcc-4.9/libgfortran | |
| parent | 9bba04175106d9b9e8a58715e3e7fa560c13e092 (diff) | |
| parent | e97c99f15937e5762a973b25192aab824126a6d3 (diff) | |
| download | toolchain_gcc-4254ad78d813b8c4cfc6c07218aee6b1be554f23.tar.gz toolchain_gcc-4254ad78d813b8c4cfc6c07218aee6b1be554f23.tar.bz2 toolchain_gcc-4254ad78d813b8c4cfc6c07218aee6b1be554f23.zip | |
Merge "[gcc-4.9] Merge svn r214745 from google/gcc-4_9 branch. Merge gcc-4_9 source r214745 from google/gcc-4_9 branch."
Diffstat (limited to 'gcc-4.9/libgfortran')
| -rw-r--r-- | gcc-4.9/libgfortran/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc-4.9/libgfortran/generated/bessel_r10.c | 2 | ||||
| -rw-r--r-- | gcc-4.9/libgfortran/generated/bessel_r16.c | 2 | ||||
| -rw-r--r-- | gcc-4.9/libgfortran/generated/bessel_r4.c | 2 | ||||
| -rw-r--r-- | gcc-4.9/libgfortran/generated/bessel_r8.c | 2 | ||||
| -rw-r--r-- | gcc-4.9/libgfortran/m4/bessel.m4 | 2 |
6 files changed, 14 insertions, 5 deletions
diff --git a/gcc-4.9/libgfortran/ChangeLog b/gcc-4.9/libgfortran/ChangeLog index 89f2c8a10..e0a003cb2 100644 --- a/gcc-4.9/libgfortran/ChangeLog +++ b/gcc-4.9/libgfortran/ChangeLog @@ -1,3 +1,12 @@ +2014-08-20 Steven G. Kargl <kargl@gcc.gnu.org> + + PR libgfortran/62188 + * m4/bessel.m4: Avoid indexing off the end of an array. + * generated/bessel_r10.c: Regenerated. + * generated/bessel_r16.c: Ditto. + * generated/bessel_r4.c: Ditto. + * generated/bessel_r8.c: Ditto. + 2014-07-31 Janne Blomqvist <jb@gcc.gnu.org> Backport from mainline diff --git a/gcc-4.9/libgfortran/generated/bessel_r10.c b/gcc-4.9/libgfortran/generated/bessel_r10.c index 14b93e910..e6977560d 100644 --- a/gcc-4.9/libgfortran/generated/bessel_r10.c +++ b/gcc-4.9/libgfortran/generated/bessel_r10.c @@ -162,7 +162,7 @@ bessel_yn_r10 (gfc_array_r10 * const restrict ret, int n1, int n2, x2rev = GFC_REAL_10_LITERAL(2.)/x; - for (i = 2; i <= n1+n2; i++) + for (i = 2; i <= n2 - n1; i++) { #if defined(GFC_REAL_10_INFINITY) if (unlikely (last2 == -GFC_REAL_10_INFINITY)) diff --git a/gcc-4.9/libgfortran/generated/bessel_r16.c b/gcc-4.9/libgfortran/generated/bessel_r16.c index d64fa9c13..67dea307e 100644 --- a/gcc-4.9/libgfortran/generated/bessel_r16.c +++ b/gcc-4.9/libgfortran/generated/bessel_r16.c @@ -166,7 +166,7 @@ bessel_yn_r16 (gfc_array_r16 * const restrict ret, int n1, int n2, x2rev = GFC_REAL_16_LITERAL(2.)/x; - for (i = 2; i <= n1+n2; i++) + for (i = 2; i <= n2 - n1; i++) { #if defined(GFC_REAL_16_INFINITY) if (unlikely (last2 == -GFC_REAL_16_INFINITY)) diff --git a/gcc-4.9/libgfortran/generated/bessel_r4.c b/gcc-4.9/libgfortran/generated/bessel_r4.c index a86bb5fa9..7bdf07b3d 100644 --- a/gcc-4.9/libgfortran/generated/bessel_r4.c +++ b/gcc-4.9/libgfortran/generated/bessel_r4.c @@ -162,7 +162,7 @@ bessel_yn_r4 (gfc_array_r4 * const restrict ret, int n1, int n2, x2rev = GFC_REAL_4_LITERAL(2.)/x; - for (i = 2; i <= n1+n2; i++) + for (i = 2; i <= n2 - n1; i++) { #if defined(GFC_REAL_4_INFINITY) if (unlikely (last2 == -GFC_REAL_4_INFINITY)) diff --git a/gcc-4.9/libgfortran/generated/bessel_r8.c b/gcc-4.9/libgfortran/generated/bessel_r8.c index 84018872e..313bf179c 100644 --- a/gcc-4.9/libgfortran/generated/bessel_r8.c +++ b/gcc-4.9/libgfortran/generated/bessel_r8.c @@ -162,7 +162,7 @@ bessel_yn_r8 (gfc_array_r8 * const restrict ret, int n1, int n2, x2rev = GFC_REAL_8_LITERAL(2.)/x; - for (i = 2; i <= n1+n2; i++) + for (i = 2; i <= n2 - n1; i++) { #if defined(GFC_REAL_8_INFINITY) if (unlikely (last2 == -GFC_REAL_8_INFINITY)) diff --git a/gcc-4.9/libgfortran/m4/bessel.m4 b/gcc-4.9/libgfortran/m4/bessel.m4 index 36ffd3356..6a865448e 100644 --- a/gcc-4.9/libgfortran/m4/bessel.m4 +++ b/gcc-4.9/libgfortran/m4/bessel.m4 @@ -163,7 +163,7 @@ bessel_yn_r'rtype_kind` ('rtype` * const restrict ret, int n1, int n2, x2rev = GFC_REAL_'rtype_kind`_LITERAL(2.)/x; - for (i = 2; i <= n1+n2; i++) + for (i = 2; i <= n2 - n1; i++) { #if defined('rtype_name`_INFINITY) if (unlikely (last2 == -'rtype_name`_INFINITY)) |