Hello community, here is the log from the commit of package gcc7 for openSUSE:Factory checked in at 2018-03-04 11:48:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcc7 (Old) and /work/SRC/openSUSE:Factory/.gcc7.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcc7" Sun Mar 4 11:48:34 2018 rev:13 rq:581734 version:7.3.1+r258025 Changes: -------- --- /work/SRC/openSUSE:Factory/gcc7/cross-aarch64-gcc7.changes 2018-01-29 14:55:09.156983310 +0100 +++ /work/SRC/openSUSE:Factory/.gcc7.new/cross-aarch64-gcc7.changes 2018-03-04 11:48:41.226635577 +0100 @@ -1,0 +2,27 @@ +Thu Mar 1 13:03:25 UTC 2018 - [email protected] + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - [email protected] + +- Update to gcc-7-branch head (r258025). + +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - [email protected] + +- 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 - [email protected] + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + +------------------------------------------------------------------- cross-arm-gcc7.changes: same change cross-avr-gcc7-bootstrap.changes: same change cross-avr-gcc7.changes: same change cross-epiphany-gcc7-bootstrap.changes: same change cross-epiphany-gcc7.changes: same change cross-hppa-gcc7.changes: same change cross-i386-gcc7.changes: same change cross-m68k-gcc7.changes: same change cross-mips-gcc7.changes: same change cross-nvptx-gcc7.changes: same change cross-ppc64-gcc7.changes: same change cross-ppc64le-gcc7.changes: same change cross-rx-gcc7-bootstrap.changes: same change cross-rx-gcc7.changes: same change cross-s390x-gcc7.changes: same change cross-sparc-gcc7.changes: same change cross-sparc64-gcc7.changes: same change cross-x86_64-gcc7.changes: same change gcc7-testresults.changes: same change gcc7.changes: same change Old: ---- gcc-7.3.0+r257042.tar.xz New: ---- gcc-7.3.1+r258025.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-aarch64-gcc7.spec ++++++ --- /var/tmp/diff_new_pack.0wJaqe/_old 2018-03-04 11:48:47.050424594 +0100 +++ /var/tmp/diff_new_pack.0wJaqe/_new 2018-03-04 11:48:47.050424594 +0100 @@ -131,6 +131,7 @@ %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: x86_64 %define nvptx_newlib 1 @@ -151,6 +152,12 @@ Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -159,7 +166,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) @@ -316,22 +323,6 @@ languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -561,9 +552,9 @@ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -575,6 +566,17 @@ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -634,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -760,16 +766,13 @@ %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -777,4 +780,10 @@ /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog cross-arm-gcc7.spec: same change cross-avr-gcc7-bootstrap.spec: same change cross-avr-gcc7.spec: same change cross-epiphany-gcc7-bootstrap.spec: same change cross-epiphany-gcc7.spec: same change cross-hppa-gcc7.spec: same change cross-i386-gcc7.spec: same change cross-m68k-gcc7.spec: same change cross-mips-gcc7.spec: same change cross-nvptx-gcc7.spec: same change cross-ppc64-gcc7.spec: same change cross-ppc64le-gcc7.spec: same change cross-rx-gcc7-bootstrap.spec: same change cross-rx-gcc7.spec: same change cross-s390x-gcc7.spec: same change cross-sparc-gcc7.spec: same change cross-sparc64-gcc7.spec: same change ++++++ cross-x86_64-gcc7.spec ++++++ --- /var/tmp/diff_new_pack.0wJaqe/_old 2018-03-04 11:48:47.502408220 +0100 +++ /var/tmp/diff_new_pack.0wJaqe/_new 2018-03-04 11:48:47.506408075 +0100 @@ -131,6 +131,7 @@ %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: %define nvptx_newlib 1 @@ -151,6 +152,12 @@ Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -159,7 +166,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) @@ -316,22 +323,6 @@ languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -561,9 +552,9 @@ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -575,6 +566,17 @@ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -634,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -760,16 +766,13 @@ %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -777,4 +780,10 @@ /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog ++++++ gcc7-testresults.spec ++++++ --- /var/tmp/diff_new_pack.0wJaqe/_old 2018-03-04 11:48:47.546406626 +0100 +++ /var/tmp/diff_new_pack.0wJaqe/_new 2018-03-04 11:48:47.550406481 +0100 @@ -253,7 +253,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) @@ -504,22 +504,6 @@ languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -751,9 +735,9 @@ STAGE1_FLAGS="-g -O2" # Only run profiled bootstrap on archs where it works and matters %ifarch x86_64 %ix86 ppc64le s390x aarch64 -make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} %else -make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} %endif make info %if 0%{?run_tests:1} @@ -763,7 +747,7 @@ mv %{GCCDIST}/libstdc++-v3/testsuite/libstdc++.sum %{GCCDIST}/libstdc++-v3/testsuite/libstdc++-abi.sum # asan needs a whole shadow address space ulimit -v unlimited || true -make -k check $PARALLEL || true +make -k check %{?_smp_mflags} || true mkdir ../testresults ../contrib/test_summary | tee ../testresults/test_summary.txt %endif gcc7.spec: same change ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.0wJaqe/_old 2018-03-04 11:48:47.630403583 +0100 +++ /var/tmp/diff_new_pack.0wJaqe/_new 2018-03-04 11:48:47.634403438 +0100 @@ -3,26 +3,9 @@ <disk> <size unit="G">16</size> </disk> - </hardware> - <overwrite> - <conditions> - <package>gcc7-testresults</package> - </conditions> - <hardware> <physicalmemory> - <size unit="G">3</size> + <size unit="G">4</size> </physicalmemory> - </hardware> - </overwrite> - <overwrite> - <conditions> - <package>gcc7</package> - </conditions> - <hardware> - <processors>4</processors> - <physicalmemory> - <size unit="G">2</size> - </physicalmemory> - </hardware> - </overwrite> + <processors>4</processors> + </hardware> </constraints> ++++++ cross.spec.in ++++++ --- /var/tmp/diff_new_pack.0wJaqe/_old 2018-03-04 11:48:47.730399960 +0100 +++ /var/tmp/diff_new_pack.0wJaqe/_new 2018-03-04 11:48:47.730399960 +0100 @@ -111,6 +111,7 @@ %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools Requires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif @@ -130,6 +131,12 @@ Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc@base_ver@ +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -139,9 +146,9 @@ # COMMON-END %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif @@ -155,6 +162,18 @@ %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib@base_ver@-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib@base_ver@-devel +Newlib development files for the nvptx offload target compiler. +%endif + + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -215,6 +234,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -341,16 +364,13 @@ %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc@base_ver@-icecream-backend @@ -358,4 +378,10 @@ /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib@base_ver@-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog -n cross-%{pkgname}-gcc@base_ver@ ++++++ gcc-7.3.0+r257042.tar.xz -> gcc-7.3.1+r258025.tar.xz ++++++ /work/SRC/openSUSE:Factory/gcc7/gcc-7.3.0+r257042.tar.xz /work/SRC/openSUSE:Factory/.gcc7.new/gcc-7.3.1+r258025.tar.xz differ: char 26, line 1 ++++++ gcc.spec.in ++++++ --- /var/tmp/diff_new_pack.0wJaqe/_old 2018-03-04 11:48:47.786397932 +0100 +++ /var/tmp/diff_new_pack.0wJaqe/_new 2018-03-04 11:48:47.786397932 +0100 @@ -239,7 +239,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r258025 Release: 1 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) @@ -1118,22 +1118,6 @@ languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -1367,9 +1351,9 @@ STAGE1_FLAGS="-g -O2" # Only run profiled bootstrap on archs where it works and matters %ifarch x86_64 %ix86 ppc64le s390x aarch64 -make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} %else -make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} %endif make info %if 0%{?run_tests:1} @@ -1379,7 +1363,7 @@ mv %{GCCDIST}/libstdc++-v3/testsuite/libstdc++.sum %{GCCDIST}/libstdc++-v3/testsuite/libstdc++-abi.sum # asan needs a whole shadow address space ulimit -v unlimited || true -make -k check $PARALLEL || true +make -k check %{?_smp_mflags} || true mkdir ../testresults ../contrib/test_summary | tee ../testresults/test_summary.txt %endif ++++++ gcc48-remove-mpfr-2.4.0-requirement.patch ++++++ --- /var/tmp/diff_new_pack.0wJaqe/_old 2018-03-04 11:48:47.814396917 +0100 +++ /var/tmp/diff_new_pack.0wJaqe/_new 2018-03-04 11:48:47.814396917 +0100 @@ -106,3 +106,142 @@ 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; + }
