aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.def8
-rw-r--r--Makefile.in28
3 files changed, 26 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 059537f..62ff3c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-11-16 Alexandre Oliva <aoliva@redhat.com>
+ * Makefile.def: Restore host and target settings for gmp.
+ * Makefile.in: Rebuild.
+
+2009-11-16 Alexandre Oliva <aoliva@redhat.com>
+
* configure.ac: Add libelf to host_libs. Enable in-tree configury
of ppl and cloog. Fix in-tree configury of libelf, skip tests.
Fix portability of test of C++ as bootstrap language. Add
diff --git a/Makefile.def b/Makefile.def
index 496213f..f5c2e11 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -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; };
diff --git a/Makefile.in b/Makefile.in
index 4d1e471..e5fa1d3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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