diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-27 12:33:24 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-10-02 11:07:15 +0000 |
| commit | 18700cbbfa7b2c0a8a21947b01fae1748bbdcae2 (patch) | |
| tree | bbbecedfb4235fe5a474728df7442a1c3fd7e1e1 /libobjc | |
| parent | 0378e2ec3fc15a72e543b336d1ea4d3677c569ef (diff) | |
Merge branches/gcc-7-branch rev 262169.
Change-Id: Ia4e0d5dab9b29367e5f61b6ebd65fa0c318dda86
Diffstat (limited to 'libobjc')
| -rw-r--r-- | libobjc/ChangeLog | 8 | ||||
| -rwxr-xr-x | libobjc/configure | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 78121927ba0..1f1e198cc45 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek <jakub@redhat.com> + + Backported from mainline + 2018-04-18 David Malcolm <dmalcolm@redhat.com> + + PR jit/85384 + * configure: Regenerate. + 2018-01-25 Release Manager * GCC 7.3.0 released. diff --git a/libobjc/configure b/libobjc/configure index abf5aed71cf..84862a82864 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -11708,7 +11708,7 @@ fi # Check whether --with-gcc-major-version-only was given. if test "${with_gcc_major_version_only+set}" = set; then : withval=$with_gcc_major_version_only; if test x$with_gcc_major_version_only = xyes ; then - get_gcc_base_ver="sed -e 's/^\([0-9]*\).*\$\$/\1/'" + get_gcc_base_ver="sed -e 's/^\([0-9]*\).*/\1/'" fi fi |