This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: fix in-tree building of ppl, cloog, libelf


On Nov 16, 2009, Alexandre Oliva <aoliva@redhat.com> wrote:

> On Nov  8, 2009, Paolo Bonzini <bonzini@gnu.org> wrote:
>> The only doubt I have is about the changes to drop the host/target
>> triples for gmp.

> Uhh.  Sorry, I forgot you had brought up this point before checking in
> the patch.  I'm now testing the reversal of that change, and I'll check
> it in as soon as I confirm it has the intended effect.

Turns out my lapse had much worse effects than both you and I guessed:
gmp's configure aborts if --target is different from --host.

This patch fixes it, and documents the problems.  I'll install it
momentarily, as a partial reversal, rather than waiting for it to
complete a full test cycle.

for  ChangeLog
from  Alexandre Oliva  <aoliva@redhat.com>

	* Makefile.def: Restore host and target settings for gmp.
	* Makefile.in: Rebuild.

Index: Makefile.def
===================================================================
--- Makefile.def.orig	2009-11-16 20:08:36.000000000 -0200
+++ Makefile.def	2009-11-16 20:12:31.000000000 -0200
@@ -62,7 +62,13 @@ host_modules= { module= gawk; };
 host_modules= { module= gettext; };
 host_modules= { module= gmp; lib_path=.libs; bootstrap=true;
 		extra_configure_flags='--disable-shared';
-		no_install= true; };
+		no_install= true;
+		// none-*-* disables asm optimizations, bootstrap-testing
+		// the compiler more thoroughly.
+	        host="none-${host_vendor}-${host_os}";
+		// 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;
 		extra_configure_flags='--disable-shared @extra_mpfr_configure_flags@';
 		no_install= true; };
Index: Makefile.in
===================================================================
--- Makefile.in.orig	2009-11-16 20:08:36.000000000 -0200
+++ Makefile.in	2009-11-16 20:12:49.000000000 -0200
@@ -16299,8 +16299,8 @@ configure-gmp: 
 	srcdiroption="--srcdir=$${topdir}/gmp"; \
 	libsrcdir="$$s/gmp"; \
 	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} --disable-shared \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
+	  --target=none-${host_vendor}-${host_os} $${srcdiroption} --disable-shared \
 	  || exit 1
 @endif gmp
 
@@ -16332,8 +16332,8 @@ configure-stage1-gmp:
 	srcdiroption="--srcdir=$${topdir}/gmp"; \
 	libsrcdir="$$s/gmp"; \
 	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
+	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  $(STAGE1_CONFIGURE_FLAGS) \
 	  --disable-shared
 @endif gmp-bootstrap
@@ -16365,8 +16365,8 @@ configure-stage2-gmp:
 	srcdiroption="--srcdir=$${topdir}/gmp"; \
 	libsrcdir="$$s/gmp"; \
 	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
+	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
 	  $(STAGE2_CONFIGURE_FLAGS) \
 	  --disable-shared
@@ -16399,8 +16399,8 @@ configure-stage3-gmp:
 	srcdiroption="--srcdir=$${topdir}/gmp"; \
 	libsrcdir="$$s/gmp"; \
 	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
+	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
 	  $(STAGE3_CONFIGURE_FLAGS) \
 	  --disable-shared
@@ -16433,8 +16433,8 @@ configure-stage4-gmp:
 	srcdiroption="--srcdir=$${topdir}/gmp"; \
 	libsrcdir="$$s/gmp"; \
 	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
+	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
 	  $(STAGE4_CONFIGURE_FLAGS) \
 	  --disable-shared
@@ -16467,8 +16467,8 @@ configure-stageprofile-gmp:
 	srcdiroption="--srcdir=$${topdir}/gmp"; \
 	libsrcdir="$$s/gmp"; \
 	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
+	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
 	  $(STAGEprofile_CONFIGURE_FLAGS) \
 	  --disable-shared
@@ -16501,8 +16501,8 @@ configure-stagefeedback-gmp:
 	srcdiroption="--srcdir=$${topdir}/gmp"; \
 	libsrcdir="$$s/gmp"; \
 	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
+	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
 	  $(STAGEfeedback_CONFIGURE_FLAGS) \
 	  --disable-shared
-- 
Alexandre Oliva, freedom fighter    http://FSFLA.org/~lxoliva/
You must be the change you wish to see in the world. -- Gandhi
Be Free! -- http://FSFLA.org/   FSF Latin America board member
Free Software Evangelist      Red Hat Brazil Compiler Engineer

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]