OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configure.ac (mpfr): Remove pre-3.1.0 mpfr compatibility code. 

2016-05-02  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        * configure.ac (mpfr): Remove pre-3.1.0 mpfr compatibility code.
        * configure: Regenerated.
        * Makefile.def (gmp): Explicitly disable assembler.
        (mpfr): Adjust lib_path.
        (mpc): Likewise.
        * Makefile.in: Regenerated.

gcc/
2016-05-02  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        * doc/install.texi: Document supported in-tree gmp/mpfr/mpc versions.

contrib/
2016-05-02  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        * download_prerequisites: Adjust gmp/mpfr/mpc versions.

From-SVN: r235763
This commit is contained in:
Bernd Edlinger 2016-05-02 15:23:20 +00:00 committed by Bernd Edlinger
parent 72407e00fd
commit 00f357941d
9 changed files with 65 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2016-05-02 Bernd Edlinger <bernd.edlinger@hotmail.de>
* configure.ac (mpfr): Remove pre-3.1.0 mpfr compatibility code.
* configure: Regenerated.
* Makefile.def (gmp): Explicitly disable assembler.
(mpfr): Adjust lib_path.
(mpc): Likewise.
* Makefile.in: Regenerated.
2016-05-01 Jakub Jelinek <jakub@redhat.com> 2016-05-01 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/70704 PR bootstrap/70704

5
Makefile.def
View File

@ -50,6 +50,7 @@ host_modules= { module= gcc; bootstrap=true;
host_modules= { module= gmp; lib_path=.libs; bootstrap=true; host_modules= { module= gmp; lib_path=.libs; bootstrap=true;
// Work around in-tree gmp configure bug with missing flex. // Work around in-tree gmp configure bug with missing flex.
extra_configure_flags='--disable-shared LEX="touch lex.yy.c"'; extra_configure_flags='--disable-shared LEX="touch lex.yy.c"';
extra_make_flags='AM_CFLAGS="-DNO_ASM"';
no_install= true; no_install= true;
// none-*-* disables asm optimizations, bootstrap-testing // none-*-* disables asm optimizations, bootstrap-testing
// the compiler more thoroughly. // the compiler more thoroughly.
@ -57,11 +58,11 @@ host_modules= { module= gmp; lib_path=.libs; bootstrap=true;
// gmp's configure will complain if given anything // gmp's configure will complain if given anything
// different from host for target. // different from host for target.
target="none-${host_vendor}-${host_os}"; }; target="none-${host_vendor}-${host_os}"; };
host_modules= { module= mpfr; lib_path=.libs; bootstrap=true; host_modules= { module= mpfr; lib_path=src/.libs; bootstrap=true;
extra_configure_flags='--disable-shared @extra_mpfr_configure_flags@'; extra_configure_flags='--disable-shared @extra_mpfr_configure_flags@';
extra_make_flags='AM_CFLAGS="-DNO_ASM"'; extra_make_flags='AM_CFLAGS="-DNO_ASM"';
no_install= true; }; no_install= true; };
host_modules= { module= mpc; lib_path=.libs; bootstrap=true; host_modules= { module= mpc; lib_path=src/.libs; bootstrap=true;
extra_configure_flags='--disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@'; extra_configure_flags='--disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@';
no_install= true; }; no_install= true; };
host_modules= { module= isl; lib_path=.libs; bootstrap=true; host_modules= { module= isl; lib_path=.libs; bootstrap=true;

58
Makefile.in
View File

@ -639,12 +639,12 @@ HOST_LIB_PATH_gmp = \
@if mpfr @if mpfr
HOST_LIB_PATH_mpfr = \ HOST_LIB_PATH_mpfr = \
$$r/$(HOST_SUBDIR)/mpfr/.libs:$$r/$(HOST_SUBDIR)/prev-mpfr/.libs: $$r/$(HOST_SUBDIR)/mpfr/src/.libs:$$r/$(HOST_SUBDIR)/prev-mpfr/src/.libs:
@endif mpfr @endif mpfr
@if mpc @if mpc
HOST_LIB_PATH_mpc = \ HOST_LIB_PATH_mpc = \
$$r/$(HOST_SUBDIR)/mpc/.libs:$$r/$(HOST_SUBDIR)/prev-mpc/.libs: $$r/$(HOST_SUBDIR)/mpc/src/.libs:$$r/$(HOST_SUBDIR)/prev-mpc/src/.libs:
@endif mpc @endif mpc
@if isl @if isl
@ -11300,7 +11300,7 @@ all-gmp: configure-gmp
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/gmp && \ (cd $(HOST_SUBDIR)/gmp && \
$(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
$(TARGET-gmp)) $(TARGET-gmp))
@endif gmp @endif gmp
@ -11329,7 +11329,7 @@ all-stage1-gmp: configure-stage1-gmp
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
$(EXTRA_HOST_FLAGS) \ $(EXTRA_HOST_FLAGS) \
$(STAGE1_FLAGS_TO_PASS) \ $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
TFLAGS="$(STAGE1_TFLAGS)" \ TFLAGS="$(STAGE1_TFLAGS)" \
$(TARGET-stage1-gmp) $(TARGET-stage1-gmp)
@ -11344,7 +11344,7 @@ clean-stage1-gmp:
fi; \ fi; \
cd $(HOST_SUBDIR)/gmp && \ cd $(HOST_SUBDIR)/gmp && \
$(MAKE) $(EXTRA_HOST_FLAGS) \ $(MAKE) $(EXTRA_HOST_FLAGS) \
$(STAGE1_FLAGS_TO_PASS) clean $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
@endif gmp-bootstrap @endif gmp-bootstrap
@ -11371,7 +11371,7 @@ all-stage2-gmp: configure-stage2-gmp
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
TFLAGS="$(STAGE2_TFLAGS)" \ TFLAGS="$(STAGE2_TFLAGS)" \
$(TARGET-stage2-gmp) $(TARGET-stage2-gmp)
@ -11385,7 +11385,7 @@ clean-stage2-gmp:
$(MAKE) stage2-start; \ $(MAKE) stage2-start; \
fi; \ fi; \
cd $(HOST_SUBDIR)/gmp && \ cd $(HOST_SUBDIR)/gmp && \
$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
@endif gmp-bootstrap @endif gmp-bootstrap
@ -11412,7 +11412,7 @@ all-stage3-gmp: configure-stage3-gmp
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
TFLAGS="$(STAGE3_TFLAGS)" \ TFLAGS="$(STAGE3_TFLAGS)" \
$(TARGET-stage3-gmp) $(TARGET-stage3-gmp)
@ -11426,7 +11426,7 @@ clean-stage3-gmp:
$(MAKE) stage3-start; \ $(MAKE) stage3-start; \
fi; \ fi; \
cd $(HOST_SUBDIR)/gmp && \ cd $(HOST_SUBDIR)/gmp && \
$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
@endif gmp-bootstrap @endif gmp-bootstrap
@ -11453,7 +11453,7 @@ all-stage4-gmp: configure-stage4-gmp
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
TFLAGS="$(STAGE4_TFLAGS)" \ TFLAGS="$(STAGE4_TFLAGS)" \
$(TARGET-stage4-gmp) $(TARGET-stage4-gmp)
@ -11467,7 +11467,7 @@ clean-stage4-gmp:
$(MAKE) stage4-start; \ $(MAKE) stage4-start; \
fi; \ fi; \
cd $(HOST_SUBDIR)/gmp && \ cd $(HOST_SUBDIR)/gmp && \
$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
@endif gmp-bootstrap @endif gmp-bootstrap
@ -11494,7 +11494,7 @@ all-stageprofile-gmp: configure-stageprofile-gmp
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
TFLAGS="$(STAGEprofile_TFLAGS)" \ TFLAGS="$(STAGEprofile_TFLAGS)" \
$(TARGET-stageprofile-gmp) $(TARGET-stageprofile-gmp)
@ -11508,7 +11508,7 @@ clean-stageprofile-gmp:
$(MAKE) stageprofile-start; \ $(MAKE) stageprofile-start; \
fi; \ fi; \
cd $(HOST_SUBDIR)/gmp && \ cd $(HOST_SUBDIR)/gmp && \
$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
@endif gmp-bootstrap @endif gmp-bootstrap
@ -11535,7 +11535,7 @@ all-stagefeedback-gmp: configure-stagefeedback-gmp
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
TFLAGS="$(STAGEfeedback_TFLAGS)" \ TFLAGS="$(STAGEfeedback_TFLAGS)" \
$(TARGET-stagefeedback-gmp) $(TARGET-stagefeedback-gmp)
@ -11549,7 +11549,7 @@ clean-stagefeedback-gmp:
$(MAKE) stagefeedback-start; \ $(MAKE) stagefeedback-start; \
fi; \ fi; \
cd $(HOST_SUBDIR)/gmp && \ cd $(HOST_SUBDIR)/gmp && \
$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
@endif gmp-bootstrap @endif gmp-bootstrap
@ -11567,7 +11567,7 @@ check-gmp:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/gmp && \ (cd $(HOST_SUBDIR)/gmp && \
$(MAKE) $(FLAGS_TO_PASS) $(EXTRA_BOOTSTRAP_FLAGS) check) $(MAKE) $(FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" $(EXTRA_BOOTSTRAP_FLAGS) check)
@endif gmp @endif gmp
@ -11602,7 +11602,7 @@ info-gmp: \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \ for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing info in gmp"; \ echo "Doing info in gmp"; \
@ -11627,7 +11627,7 @@ dvi-gmp: \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \ for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing dvi in gmp"; \ echo "Doing dvi in gmp"; \
@ -11652,7 +11652,7 @@ pdf-gmp: \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \ for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing pdf in gmp"; \ echo "Doing pdf in gmp"; \
@ -11677,7 +11677,7 @@ html-gmp: \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \ for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing html in gmp"; \ echo "Doing html in gmp"; \
@ -11702,7 +11702,7 @@ TAGS-gmp: \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \ for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing TAGS in gmp"; \ echo "Doing TAGS in gmp"; \
@ -11728,7 +11728,7 @@ install-info-gmp: \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \ for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing install-info in gmp"; \ echo "Doing install-info in gmp"; \
@ -11754,7 +11754,7 @@ install-pdf-gmp: \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \ for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing install-pdf in gmp"; \ echo "Doing install-pdf in gmp"; \
@ -11780,7 +11780,7 @@ install-html-gmp: \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \ for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing install-html in gmp"; \ echo "Doing install-html in gmp"; \
@ -11805,7 +11805,7 @@ installcheck-gmp: \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \ for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing installcheck in gmp"; \ echo "Doing installcheck in gmp"; \
@ -11829,7 +11829,7 @@ mostlyclean-gmp:
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \ for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing mostlyclean in gmp"; \ echo "Doing mostlyclean in gmp"; \
@ -11853,7 +11853,7 @@ clean-gmp:
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \ for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing clean in gmp"; \ echo "Doing clean in gmp"; \
@ -11877,7 +11877,7 @@ distclean-gmp:
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \ for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing distclean in gmp"; \ echo "Doing distclean in gmp"; \
@ -11901,7 +11901,7 @@ maintainer-clean-gmp:
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \ for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing maintainer-clean in gmp"; \ echo "Doing maintainer-clean in gmp"; \

7
configure vendored
View File

@ -5568,16 +5568,9 @@ if test "x$with_mpfr_lib" != x; then
gmplibs="-L$with_mpfr_lib $gmplibs" gmplibs="-L$with_mpfr_lib $gmplibs"
fi fi
if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then
# MPFR v3.1.0 moved the sources into a src sub-directory.
if test -d ${srcdir}/mpfr/src; then
gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs" gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs"
gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc" gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc"
extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir" extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir"
else
gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"
gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir"
fi
# Do not test the mpfr version. Assume that it is sufficient, since # Do not test the mpfr version. Assume that it is sufficient, since
# it is in the source tree, and the library has not been built yet # it is in the source tree, and the library has not been built yet
# but it would be included on the link line in the version check below # but it would be included on the link line in the version check below

7
configure.ac
View File

@ -1548,16 +1548,9 @@ if test "x$with_mpfr_lib" != x; then
gmplibs="-L$with_mpfr_lib $gmplibs" gmplibs="-L$with_mpfr_lib $gmplibs"
fi fi
if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then
# MPFR v3.1.0 moved the sources into a src sub-directory.
if test -d ${srcdir}/mpfr/src; then
gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs" gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs"
gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc" gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc"
extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir" extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir"
else
gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"
gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir"
fi
# Do not test the mpfr version. Assume that it is sufficient, since # Do not test the mpfr version. Assume that it is sufficient, since
# it is in the source tree, and the library has not been built yet # it is in the source tree, and the library has not been built yet
# but it would be included on the link line in the version check below # but it would be included on the link line in the version check below

4
contrib/ChangeLog
View File

@ -1,3 +1,7 @@
2016-05-02 Bernd Edlinger <bernd.edlinger@hotmail.de>
* download_prerequisites: Adjust gmp/mpfr/mpc versions.
2016-04-30 Oleg Endo <olegendo@gcc.gnu.org> 2016-04-30 Oleg Endo <olegendo@gcc.gnu.org>
* compare-all-tests: Remove SH5 support. * compare-all-tests: Remove SH5 support.

8
contrib/download_prerequisites
View File

@ -4,7 +4,7 @@
# Run this from the top level of the gcc source tree and the gcc # Run this from the top level of the gcc source tree and the gcc
# build will do the right thing. # build will do the right thing.
# #
# (C) 2010 Free Software Foundation # (C) 2010-2016 Free Software Foundation
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -30,9 +30,9 @@ if [ ! -e gcc/BASE-VER ] ; then
fi fi
# Necessary to build GCC. # Necessary to build GCC.
MPFR=mpfr-2.4.2 MPFR=mpfr-3.1.4
GMP=gmp-4.3.2 GMP=gmp-6.1.0
MPC=mpc-0.8.1 MPC=mpc-1.0.3
wget ftp://gcc.gnu.org/pub/gcc/infrastructure/$MPFR.tar.bz2 || exit 1 wget ftp://gcc.gnu.org/pub/gcc/infrastructure/$MPFR.tar.bz2 || exit 1
tar xjf $MPFR.tar.bz2 || exit 1 tar xjf $MPFR.tar.bz2 || exit 1

4
gcc/ChangeLog
View File

@ -1,3 +1,7 @@
2016-05-02 Bernd Edlinger <bernd.edlinger@hotmail.de>
* doc/install.texi: Document supported in-tree gmp/mpfr/mpc versions.
2016-05-02 Marc Glisse <marc.glisse@inria.fr> 2016-05-02 Marc Glisse <marc.glisse@inria.fr>
* match.pd (X u< X, X u> X): New transformations. * match.pd (X u< X, X u> X): New transformations.

6
gcc/doc/install.texi
View File

@ -362,6 +362,8 @@ together with GCC. Alternatively, if GMP is already installed but it
is not in your library search path, you will have to configure with the is not in your library search path, you will have to configure with the
@option{--with-gmp} configure option. See also @option{--with-gmp-lib} @option{--with-gmp} configure option. See also @option{--with-gmp-lib}
and @option{--with-gmp-include}. and @option{--with-gmp-include}.
The in-tree build is only supported with the GMP version that
download_prerequisites installs.
@item MPFR Library version 2.4.2 (or later) @item MPFR Library version 2.4.2 (or later)
@ -372,6 +374,8 @@ built together with GCC. Alternatively, if MPFR is already installed
but it is not in your default library search path, the but it is not in your default library search path, the
@option{--with-mpfr} configure option should be used. See also @option{--with-mpfr} configure option should be used. See also
@option{--with-mpfr-lib} and @option{--with-mpfr-include}. @option{--with-mpfr-lib} and @option{--with-mpfr-include}.
The in-tree build is only supported with the MPFR version that
download_prerequisites installs.
@item MPC Library version 0.8.1 (or later) @item MPC Library version 0.8.1 (or later)
@ -382,6 +386,8 @@ will be built together with GCC. Alternatively, if MPC is already
installed but it is not in your default library search path, the installed but it is not in your default library search path, the
@option{--with-mpc} configure option should be used. See also @option{--with-mpc} configure option should be used. See also
@option{--with-mpc-lib} and @option{--with-mpc-include}. @option{--with-mpc-lib} and @option{--with-mpc-include}.
The in-tree build is only supported with the MPC version that
download_prerequisites installs.
@item isl Library version 0.16, 0.15, or 0.14. @item isl Library version 0.16, 0.15, or 0.14.