From 79bb0de3e5eb6c345ebf3f8be5effc0a84c4a3bd Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Thu, 23 Jun 2016 15:47:44 -0400
Subject: Sync with upstream gcc.

---
 Makefile.def | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'Makefile.def')

diff --git a/Makefile.def b/Makefile.def
index ea8453e85..05316a407 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -50,6 +50,7 @@ host_modules= { module= gcc; bootstrap=true;
 host_modules= { module= gmp; lib_path=.libs; bootstrap=true;
 		// Work around in-tree gmp configure bug with missing flex.
 		extra_configure_flags='--disable-shared LEX="touch lex.yy.c"';
+		extra_make_flags='AM_CFLAGS="-DNO_ASM"';
 		no_install= true;
 		// none-*-* disables asm optimizations, bootstrap-testing
 		// 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
 		// different from host for target.
 	        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_make_flags='AM_CFLAGS="-DNO_ASM"';
 		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@';
 		no_install= true; };
 host_modules= { module= isl; lib_path=.libs; bootstrap=true;
@@ -638,3 +639,10 @@ bootstrap_stage = {
 bootstrap_stage = {
 	id=feedback ; prev=profile ;
 	bootstrap_target=profiledbootstrap ; };
+bootstrap_stage = {
+	id=autoprofile ; prev=1 ;
+        autoprofile="$$s/gcc/config/i386/$(AUTO_PROFILE)" ; };
+bootstrap_stage = {
+	id=autofeedback ; prev=autoprofile ;
+	bootstrap_target=autoprofiledbootstrap ;
+	profile_data="PERF_DATA=perf.data" ; };
-- 
cgit v1.2.3

