diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-aarch64-gcc7.changes +++ b/cross-aarch64-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-arm-gcc7.changes +++ b/cross-arm-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-avr-gcc7-bootstrap.changes b/cross-avr-gcc7-bootstrap.changes index a68afb8..0c44b16 100644 --- a/cross-avr-gcc7-bootstrap.changes +++ b/cross-avr-gcc7-bootstrap.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-avr-gcc7.changes +++ b/cross-avr-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes index a68afb8..0c44b16 100644 --- a/cross-epiphany-gcc7-bootstrap.changes +++ b/cross-epiphany-gcc7-bootstrap.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-epiphany-gcc7.changes +++ b/cross-epiphany-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-hppa-gcc7.changes +++ b/cross-hppa-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-i386-gcc7.changes +++ b/cross-i386-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-m68k-gcc7.changes +++ b/cross-m68k-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-mips-gcc7.changes +++ b/cross-mips-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-nvptx-gcc7.changes +++ b/cross-nvptx-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-ppc64-gcc7.changes +++ b/cross-ppc64-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-ppc64le-gcc7.changes +++ b/cross-ppc64le-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes index a68afb8..0c44b16 100644 --- a/cross-rx-gcc7-bootstrap.changes +++ b/cross-rx-gcc7-bootstrap.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-rx-gcc7.changes +++ b/cross-rx-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-s390x-gcc7.changes +++ b/cross-s390x-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-sparc-gcc7.changes +++ b/cross-sparc-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-sparc64-gcc7.changes +++ b/cross-sparc64-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-x86_64-gcc7.changes +++ b/cross-x86_64-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/gcc48-remove-mpfr-2.4.0-requirement.patch b/gcc48-remove-mpfr-2.4.0-requirement.patch index 0e513a5..b5eb04f 100644 --- a/gcc48-remove-mpfr-2.4.0-requirement.patch +++ b/gcc48-remove-mpfr-2.4.0-requirement.patch @@ -106,3 +106,142 @@ Index: gcc/ubsan.c else return NULL_TREE; +Index: gcc/gimple-ssa-sprintf.c +=================================================================== +--- gcc/gimple-ssa-sprintf.c (revision 257728) ++++ gcc/gimple-ssa-sprintf.c (working copy) +@@ -1637,18 +1637,7 @@ get_mpfr_format_length (mpfr_ptr x, cons + p = 1024; + } + +- len = mpfr_snprintf (NULL, 0, fmtstr, (int)p, x); +- +- /* Handle the unlikely (impossible?) error by returning more than +- the maximum dictated by the function's return type. */ +- if (len < 0) +- return target_dir_max () + 1; +- +- /* Adjust the return value by the difference. */ +- if (p < prec) +- len += prec - p; +- +- return len; ++ return target_dir_max () + 1; + } + + /* Return the number of bytes to format using the format specifier + +Index: gcc/fortran/simplify.c +=================================================================== +--- gcc/fortran/simplify.c (revision 257983) ++++ gcc/fortran/simplify.c (working copy) +@@ -1745,51 +1745,6 @@ simplify_trig_call (gfc_expr *icall) + } + } + +-/* Convert a floating-point number from radians to degrees. */ +- +-static void +-degrees_f (mpfr_t x, mp_rnd_t rnd_mode) +-{ +- mpfr_t tmp; +- mpfr_init (tmp); +- +- /* Set x = x % 2pi to avoid offsets with large angles. */ +- mpfr_const_pi (tmp, rnd_mode); +- mpfr_mul_ui (tmp, tmp, 2, rnd_mode); +- mpfr_fmod (tmp, x, tmp, rnd_mode); +- +- /* Set x = x * 180. */ +- mpfr_mul_ui (x, x, 180, rnd_mode); +- +- /* Set x = x / pi. */ +- mpfr_const_pi (tmp, rnd_mode); +- mpfr_div (x, x, tmp, rnd_mode); +- +- mpfr_clear (tmp); +-} +- +-/* Convert a floating-point number from degrees to radians. */ +- +-static void +-radians_f (mpfr_t x, mp_rnd_t rnd_mode) +-{ +- mpfr_t tmp; +- mpfr_init (tmp); +- +- /* Set x = x % 360 to avoid offsets with large angles. */ +- mpfr_set_ui (tmp, 360, rnd_mode); +- mpfr_fmod (tmp, x, tmp, rnd_mode); +- +- /* Set x = x * pi. */ +- mpfr_const_pi (tmp, rnd_mode); +- mpfr_mul (x, x, tmp, rnd_mode); +- +- /* Set x = x / 180. */ +- mpfr_div_ui (x, x, 180, rnd_mode); +- +- mpfr_clear (tmp); +-} +- + + /* Convert argument to radians before calling a trig function. */ + +@@ -1803,12 +1758,7 @@ gfc_simplify_trigd (gfc_expr *icall) + if (arg->ts.type != BT_REAL) + gfc_internal_error ("in gfc_simplify_trigd(): Bad type"); + +- if (arg->expr_type == EXPR_CONSTANT) +- /* Convert constant to radians before passing off to simplifier. */ +- radians_f (arg->value.real, GFC_RND_MODE); +- +- /* Let the usual simplifier take over - we just simplified the arg. */ +- return simplify_trig_call (icall); ++ return NULL; + } + + /* Convert result of an inverse trig function to degrees. */ +@@ -1816,21 +1766,9 @@ gfc_simplify_trigd (gfc_expr *icall) + gfc_expr * + gfc_simplify_atrigd (gfc_expr *icall) + { +- gfc_expr *result; +- + if (icall->value.function.actual->expr->ts.type != BT_REAL) + gfc_internal_error ("in gfc_simplify_atrigd(): Bad type"); + +- /* See if another simplifier has work to do first. */ +- result = simplify_trig_call (icall); +- +- if (result && result->expr_type == EXPR_CONSTANT) +- { +- /* Convert constant to degrees after passing off to actual simplifier. */ +- degrees_f (result->value.real, GFC_RND_MODE); +- return result; +- } +- + /* Let gfc_resolve_atrigd take care of the non-constant case. */ + return NULL; + } +@@ -1840,21 +1778,9 @@ gfc_simplify_atrigd (gfc_expr *icall) + gfc_expr * + gfc_simplify_atan2d (gfc_expr *y, gfc_expr *x) + { +- gfc_expr *result; +- + if (x->ts.type != BT_REAL || y->ts.type != BT_REAL) + gfc_internal_error ("in gfc_simplify_atan2d(): Bad type"); + +- if (x->expr_type == EXPR_CONSTANT && y->expr_type == EXPR_CONSTANT) +- { +- result = gfc_simplify_atan2 (y, x); +- if (result != NULL) +- { +- degrees_f (result->value.real, GFC_RND_MODE); +- return result; +- } +- } +- + /* Let gfc_resolve_atan2d take care of the non-constant case. */ + return NULL; + } diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes index a68afb8..0c44b16 100644 --- a/gcc7-testresults.changes +++ b/gcc7-testresults.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/gcc7.changes b/gcc7.changes index a68afb8..0c44b16 100644 --- a/gcc7.changes +++ b/gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com