--- gcc-releases-gcc-13.3.0/configure.~1~	2021-07-28 08:55:28.000000000 +0000
+++ gcc-releases-gcc-13.3.0/configure	2022-02-03 15:40:05.993932195 +0000
@@ -751,6 +751,8 @@
 target_alias
 host_alias
 build_alias
+gmp_alias
+CPU_FLAGS
 LIBS
 ECHO_T
 ECHO_N
@@ -9381,7 +9383,24 @@
   DEBUG_PREFIX_CFLAGS_FOR_TARGET=
 fi
 
-
+# set gmp_alias/CPU_FLAGS to setup/tune CFLAGS usage in GMP on Solaris.
+case "${target}" in
+  *-*-solaris2.11) myarch=`uname -p`
+    if [ "$myarch" = "sparc" ]; then
+      mycpu=`uname -m`
+      if test "$mycpu" = "sun4u"; then
+       gmp_alias=ultrasparc2-sun-solaris2.11
+       CPU_FLAGS="-mcpu=ultrasparc -mvis -mfsmuld"
+      else
+       gmp_alias=ultrasparct1-sun-solaris2.11
+       CPU_FLAGS="-mcpu=ultrasparc -mvis -mfsmuld"
+      fi
+    else
+      gmp_alias=x86_64-pc-solaris2.11
+      CPU_FLAGS="-mtune=generic"
+    fi
+  ;;
+esac
 
 # During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
 # might be empty or "-g".  We don't require a C++ compiler, so CXXFLAGS
@@ -9396,11 +9415,11 @@
     CFLAGS_FOR_TARGET=$CFLAGS
     case " $CFLAGS " in
       *" -O2 "*) ;;
-      *) CFLAGS_FOR_TARGET="-O2 $CFLAGS_FOR_TARGET" ;;
+      *) CFLAGS_FOR_TARGET="-O2 $CFLAGS_FOR_TARGET $CPU_FLAGS" ;;
     esac
     case " $CFLAGS " in
       *" -g "* | *" -g3 "*) ;;
-      *) CFLAGS_FOR_TARGET="-g $CFLAGS_FOR_TARGET" ;;
+      *) CFLAGS_FOR_TARGET="$CFLAGS_FOR_TARGET $CPU_FLAGS" ;;
     esac
   fi
 fi
@@ -9413,11 +9432,11 @@
     CXXFLAGS_FOR_TARGET=$CXXFLAGS
     case " $CXXFLAGS " in
       *" -O2 "*) ;;
-      *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS_FOR_TARGET" ;;
+      *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS_FOR_TARGET $CPU_FLAGS" ;;
     esac
     case " $CXXFLAGS " in
       *" -g "* | *" -g3 "*) ;;
-      *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS_FOR_TARGET" ;;
+      *) CXXFLAGS_FOR_TARGET="$CXXFLAGS_FOR_TARGET $CPU_FLAGS" ;;
     esac
   fi
 fi
@@ -18502,7 +18521,7 @@
 # ---------------------
 
 # Stage specific cflags for build.
-stage1_cflags="-g"
+stage1_cflags="-g -O2 -m64 -mcpu=ultrasparc -mvis -mfsmuld"
 case $build in
   vax-*-*)
     case ${GCC} in
--- gcc-releases-gcc-13.4.0/gcc/configure.~3~	2026-06-28 11:11:07.223180100 +0200
+++ gcc-releases-gcc-13.4.0/gcc/configure	2026-06-28 11:49:43.532240800 +0200
@@ -25316,17 +25316,6 @@
 
 
 gcc_cv_ld_aligned_shf_merge=yes
-case "$target" in
-  # SHF_MERGE support is broken in Solaris ld up to Solaris 11.3/SPARC for
-  # alignment > 1.
-  sparc*-*-solaris2.11*)
-    if test x"$gnu_ld" = xno \
-       && test "$ld_vers_major" -lt 2 && test "$ld_vers_minor" -lt 3159; then
-      gcc_cv_ld_aligned_shf_merge=no
-    fi
-    ;;
-esac
-
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LD_ALIGNED_SHF_MERGE `if test $gcc_cv_ld_aligned_shf_merge = yes; then echo 1; else echo 0; fi`
 _ACEOF
@@ -26882,6 +26871,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_sparc_ua_pcrel" >&5
 $as_echo "$gcc_cv_as_sparc_ua_pcrel" >&6; }
+gcc_cv_as_sparc_ua_pcrel=no
 if test $gcc_cv_as_sparc_ua_pcrel = yes; then
 
 $as_echo "#define HAVE_AS_SPARC_UA_PCREL 1" >>confdefs.h
--- gcc-releases-gcc-13.4.0/libgcc/configure.~1~	2021-07-28 08:55:28.000000000 +0000
+++ gcc-releases-gcc-13.4.0/libgcc/configure	2022-02-03 15:40:06.051847362 +0000
@@ -4307,6 +4307,9 @@
   break
 done
 fi
+case $with_multisubdir in
+  sparcv8plus|32) ac_cv_sys_file_offset_bits=32 ;;
+esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
 $as_echo "$ac_cv_sys_file_offset_bits" >&6; }
 case $ac_cv_sys_file_offset_bits in #(
--- a/gcc/config/sparc/sol2.h.orig	2022-04-21 10:59:17.000000000 +0000
+++ b/gcc/config/sparc/sol2.h	2022-05-19 12:51:49.767643135 +0000
@@ -456,3 +456,20 @@
 
 #undef SPARC_LOW_FE_EXCEPT_VALUES
 #define SPARC_LOW_FE_EXCEPT_VALUES 1
+
+/*
+ * As of 5788, the illumos libc includes support for the stack protector
+ * __stack_chk_fail() function and for the __stack_chk_guard variable.
+ * That means that, for most cases, no extra objects need to be linked in
+ * when compiling with one of the -fstack-protector options.
+ * However, for 32-bit PIC/PIE objects, the gcc stack protector emits a
+ * function call to __stack_chk_fail_local(); this symbol is provided in
+ * illumos via the libssp_ns.a object. The spec below includes this in the
+ * link when appropriate.
+ */
+#if defined(TARGET_LIBC_PROVIDES_SSP)
+#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all|" \
+			"fstack-protector-strong|fstack-protector-explicit:" \
+			DEF_ARCH32_SPEC("-lssp_ns") \
+			"}"
+#endif
--- gcc-5.3.0.orig/gcc/config/sparc/t-sol2	Wed Apr 30 09:10:44 2014
+++ gcc-5.3.0/gcc/config/sparc/t-sol2	Tue Jan  5 10:50:03 2016
@@ -1,4 +1,4 @@
 MULTILIB_OPTIONS = m32/m64
-MULTILIB_DIRNAMES = sparcv8plus sparcv9
+MULTILIB_DIRNAMES = 32 sparcv9
 MULTILIB_MATCHES =
 MULTILIB_OSDIRNAMES = . sparcv9
-------------------------------------------------------------------------------------
Reverts gcc/libgcc/unwind-dw2-fde.(c|h) to version from GCC 12.

This is temporary workaround for: 

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110955

--- gcc-13.4.0/libgcc/unwind-dw2-fde.c
+++ gcc-13.4.0/libgcc/unwind-dw2-fde.c
@@ -42,40 +42,14 @@ #define ATOMIC_FDE_FAST_PATH 1
 #endif
 #endif
 
-typedef __UINTPTR_TYPE__ uintptr_type;
-
-#ifdef ATOMIC_FDE_FAST_PATH
-#include "unwind-dw2-btree.h"
-
-static struct btree registered_frames;
-static struct btree registered_objects;
-static bool in_shutdown;
-
-static void
-release_registered_frames (void) __attribute__ ((destructor));
-static void
-release_registered_frames (void)
-{
-  /* Release the b-tree and all frames. Frame releases that happen later are
-   * silently ignored */
-  btree_destroy (&registered_frames);
-  btree_destroy (&registered_objects);
-  in_shutdown = true;
-}
-
-static void
-get_pc_range (const struct object *ob, uintptr_type *range);
-
-#else
-/* Without fast path frame deregistration must always succeed.  */
-static const int in_shutdown = 0;
-
 /* The unseen_objects list contains objects that have been registered
    but not yet categorized in any way.  The seen_objects list has had
    its pc_begin and count fields initialized at minimum, and is sorted
    by decreasing value of pc_begin.  */
 static struct object *unseen_objects;
 static struct object *seen_objects;
+#ifdef ATOMIC_FDE_FAST_PATH
+static int any_objects_registered;
 #endif
 
 #ifdef __GTHREAD_MUTEX_INIT
@@ -105,21 +79,6 @@ static __gthread_mutex_t object_mutex;
 #endif
 #endif
 
-#ifdef ATOMIC_FDE_FAST_PATH
-// Register the pc range for a given object in the lookup structure.
-static void
-register_pc_range_for_object (uintptr_type begin, struct object *ob)
-{
-  // Register the object itself to know the base pointer on deregistration.
-  btree_insert (&registered_objects, begin, 1, ob);
-
-  // Register the frame in the b-tree
-  uintptr_type range[2];
-  get_pc_range (ob, range);
-  btree_insert (&registered_frames, range[0], range[1] - range[0], ob);
-}
-#endif
-
 /* Called from crtbegin.o to register the unwind info for an object.  */
 
 void
@@ -140,17 +99,23 @@ #ifdef DWARF2_OBJECT_END_PTR_EXTENSION
   ob->fde_end = NULL;
 #endif
 
-#ifdef ATOMIC_FDE_FAST_PATH
-  register_pc_range_for_object ((uintptr_type) begin, ob);
-#else
   init_object_mutex_once ();
   __gthread_mutex_lock (&object_mutex);
 
   ob->next = unseen_objects;
   unseen_objects = ob;
+#ifdef ATOMIC_FDE_FAST_PATH
+  /* Set flag that at least one library has registered FDEs.
+     Use relaxed MO here, it is up to the app to ensure that the library
+     loading/initialization happens-before using that library in other
+     threads (in particular unwinding with that library's functions
+     appearing in the backtraces).  Calling that library's functions
+     without waiting for the library to initialize would be racy.  */
+  if (!any_objects_registered)
+    __atomic_store_n (&any_objects_registered, 1, __ATOMIC_RELAXED);
+#endif
 
   __gthread_mutex_unlock (&object_mutex);
-#endif
 }
 
 void
@@ -188,17 +153,23 @@ ob->s.i = 0;
   ob->s.b.from_array = 1;
   ob->s.b.encoding = DW_EH_PE_omit;
 
-#ifdef ATOMIC_FDE_FAST_PATH
-  register_pc_range_for_object ((uintptr_type) begin, ob);
-#else
   init_object_mutex_once ();
   __gthread_mutex_lock (&object_mutex);
 
   ob->next = unseen_objects;
   unseen_objects = ob;
+#ifdef ATOMIC_FDE_FAST_PATH
+  /* Set flag that at least one library has registered FDEs.
+     Use relaxed MO here, it is up to the app to ensure that the library
+     loading/initialization happens-before using that library in other
+     threads (in particular unwinding with that library's functions
+     appearing in the backtraces).  Calling that library's functions
+     without waiting for the library to initialize would be racy.  */
+  if (!any_objects_registered)
+    __atomic_store_n (&any_objects_registered, 1, __ATOMIC_RELAXED);
+#endif
 
   __gthread_mutex_unlock (&object_mutex);
-#endif
 }
 
 void
@@ -229,35 +200,16 @@ implements __register_frame_info_bases.
 void *
 __deregister_frame_info_bases (const void *begin)
 {
+  struct object **p;
   struct object *ob = 0;
 
   /* If .eh_frame is empty, we haven't registered.  */
   if ((const uword *) begin == 0 || *(const uword *) begin == 0)
     return ob;
 
-#ifdef ATOMIC_FDE_FAST_PATH
-  // Find the originally registered object to get the base pointer.
-  ob = btree_remove (&registered_objects, (uintptr_type) begin);
-
-  // Remove the corresponding PC range.
-  if (ob)
-    {
-      uintptr_type range[2];
-      get_pc_range (ob, range);
-      if (range[0] != range[1])
-	btree_remove (&registered_frames, range[0]);
-    }
-
-  // Deallocate the sort array if any.
-  if (ob && ob->s.b.sorted)
-    {
-      free (ob->u.sort);
-    }
-#else
   init_object_mutex_once ();
   __gthread_mutex_lock (&object_mutex);
 
-  struct object **p;
   for (p = &unseen_objects; *p ; p = &(*p)->next)
     if ((*p)->u.single == begin)
       {
@@ -289,11 +241,7 @@ }
 
  out:
   __gthread_mutex_unlock (&object_mutex);
-#endif
-
-  // If we didn't find anything in the lookup data structures then they
-  // were either already destroyed or we tried to remove an empty range.
-  gcc_assert (in_shutdown || ob);
+  gcc_assert (ob);
   return (void *) ob;
 }
 
@@ -316,7 +264,7 @@ /* Like base_of_encoded_value, but take
    instead of an _Unwind_Context.  */
 
 static _Unwind_Ptr
-base_from_object (unsigned char encoding, const struct object *ob)
+base_from_object (unsigned char encoding, struct object *ob)
 {
   if (encoding == DW_EH_PE_omit)
     return 0;
@@ -463,52 +411,21 @@ }
 
 typedef int (*fde_compare_t) (struct object *, const fde *, const fde *);
 
-// The extractor functions compute the pointer values for a block of
-// fdes. The block processing hides the call overhead.
-
-static void
-fde_unencoded_extract (struct object *ob __attribute__ ((unused)),
-		       _Unwind_Ptr *target, const fde **x, int count)
-{
-  for (int index = 0; index < count; ++index)
-    memcpy (target + index, x[index]->pc_begin, sizeof (_Unwind_Ptr));
-}
-
-static void
-fde_single_encoding_extract (struct object *ob, _Unwind_Ptr *target,
-			     const fde **x, int count)
-{
-  _Unwind_Ptr base;
-
-  base = base_from_object (ob->s.b.encoding, ob);
-  for (int index = 0; index < count; ++index)
-    read_encoded_value_with_base (ob->s.b.encoding, base, x[index]->pc_begin,
-				  target + index);
-}
-
-static void
-fde_mixed_encoding_extract (struct object *ob, _Unwind_Ptr *target,
-			    const fde **x, int count)
-{
-  for (int index = 0; index < count; ++index)
-    {
-      int encoding = get_fde_encoding (x[index]);
-      read_encoded_value_with_base (encoding, base_from_object (encoding, ob),
-				    x[index]->pc_begin, target + index);
-    }
-}
-
-typedef void (*fde_extractor_t) (struct object *, _Unwind_Ptr *, const fde **,
-				 int);
-
-// Data is is sorted using radix sort if possible, using an temporary
-// auxiliary data structure of the same size as the input. When running
-// out of memory do in-place heap sort.
+/* This is a special mix of insertion sort and heap sort, optimized for
+   the data sets that actually occur. They look like
+   101 102 103 127 128 105 108 110 190 111 115 119 125 160 126 129 130.
+   I.e. a linearly increasing sequence (coming from functions in the text
+   section), with additionally a few unordered elements (coming from functions
+   in gnu_linkonce sections) whose values are higher than the values in the
+   surrounding linear sequence (but not necessarily higher than the values
+   at the end of the linear sequence!).
+   The worst-case total run time is O(N) + O(n log (n)), where N is the
+   total number of FDEs and n is the number of erratic ones.  */
 
 struct fde_accumulator
 {
   struct fde_vector *linear;
-  struct fde_vector *aux;
+  struct fde_vector *erratic;
 };
 
 static inline int
@@ -522,8 +439,8 @@ size = sizeof (struct fde_vector) + size
   if ((accu->linear = malloc (size)))
     {
       accu->linear->count = 0;
-      if ((accu->aux = malloc (size)))
-	accu->aux->count = 0;
+      if ((accu->erratic = malloc (size)))
+	accu->erratic->count = 0;
       return 1;
     }
   else
@@ -537,6 +454,59 @@ if (accu->linear)
     accu->linear->array[accu->linear->count++] = this_fde;
 }
 
+/* Split LINEAR into a linear sequence with low values and an erratic
+   sequence with high values, put the linear one (of longest possible
+   length) into LINEAR and the erratic one into ERRATIC. This is O(N).
+
+   Because the longest linear sequence we are trying to locate within the
+   incoming LINEAR array can be interspersed with (high valued) erratic
+   entries.  We construct a chain indicating the sequenced entries.
+   To avoid having to allocate this chain, we overlay it onto the space of
+   the ERRATIC array during construction.  A final pass iterates over the
+   chain to determine what should be placed in the ERRATIC array, and
+   what is the linear sequence.  This overlay is safe from aliasing.  */
+
+static inline void
+fde_split (struct object *ob, fde_compare_t fde_compare,
+	   struct fde_vector *linear, struct fde_vector *erratic)
+{
+  static const fde *marker;
+  size_t count = linear->count;
+  const fde *const *chain_end = &marker;
+  size_t i, j, k;
+
+  /* This should optimize out, but it is wise to make sure this assumption
+     is correct. Should these have different sizes, we cannot cast between
+     them and the overlaying onto ERRATIC will not work.  */
+  gcc_assert (sizeof (const fde *) == sizeof (const fde **));
+
+  for (i = 0; i < count; i++)
+    {
+      const fde *const *probe;
+
+      for (probe = chain_end;
+	   probe != &marker && fde_compare (ob, linear->array[i], *probe) < 0;
+	   probe = chain_end)
+	{
+	  chain_end = (const fde *const*) erratic->array[probe - linear->array];
+	  erratic->array[probe - linear->array] = NULL;
+	}
+      erratic->array[i] = (const fde *) chain_end;
+      chain_end = &linear->array[i];
+    }
+
+  /* Each entry in LINEAR which is part of the linear sequence we have
+     discovered will correspond to a non-NULL entry in the chain we built in
+     the ERRATIC array.  */
+  for (i = j = k = 0; i < count; i++)
+    if (erratic->array[i])
+      linear->array[j++] = linear->array[i];
+    else
+      erratic->array[k++] = linear->array[i];
+  linear->count = j;
+  erratic->count = k;
+}
+
 #define SWAP(x,y) do { const fde * tmp = x; x = y; y = tmp; } while (0)
 
 /* Convert a semi-heap to a heap.  A semi-heap is a heap except possibly
@@ -599,130 +569,71 @@ }
 #undef SWAP
 }
 
-// Radix sort data in V1 using V2 as aux memory. Runtime O(n).
+/* Merge V1 and V2, both sorted, and put the result into V1.  */
 static inline void
-fde_radixsort (struct object *ob, fde_extractor_t fde_extractor,
-	       struct fde_vector *v1, struct fde_vector *v2)
+fde_merge (struct object *ob, fde_compare_t fde_compare,
+	   struct fde_vector *v1, struct fde_vector *v2)
 {
-#define FANOUTBITS 8
-#define FANOUT (1 << FANOUTBITS)
-#define BLOCKSIZE 128
-  const unsigned rounds
-    = (__CHAR_BIT__ * sizeof (_Unwind_Ptr) + FANOUTBITS - 1) / FANOUTBITS;
-  const fde **a1 = v1->array, **a2 = v2->array;
-  _Unwind_Ptr ptrs[BLOCKSIZE + 1];
-  unsigned n = v1->count;
-  for (unsigned round = 0; round != rounds; ++round)
-    {
-      unsigned counts[FANOUT] = {0};
-      unsigned violations = 0;
-
-      // Count the number of elements per bucket and check if we are already
-      // sorted.
-      _Unwind_Ptr last = 0;
-      for (unsigned i = 0; i < n;)
-	{
-	  unsigned chunk = ((n - i) <= BLOCKSIZE) ? (n - i) : BLOCKSIZE;
-	  fde_extractor (ob, ptrs + 1, a1 + i, chunk);
-	  ptrs[0] = last;
-	  for (unsigned j = 0; j < chunk; ++j)
-	    {
-	      unsigned b = (ptrs[j + 1] >> (round * FANOUTBITS)) & (FANOUT - 1);
-	      counts[b]++;
-	      // Use summation instead of an if to eliminate branches.
-	      violations += ptrs[j + 1] < ptrs[j];
-	    }
-	  i += chunk;
-	  last = ptrs[chunk];
-	}
-
-      // Stop if we are already sorted.
-      if (!violations)
-	{
-	  break;
-	}
+  size_t i1, i2;
+  const fde * fde2;
 
-      // Compute the prefix sum.
-      unsigned sum = 0;
-      for (unsigned i = 0; i != FANOUT; ++i)
-	{
-	  unsigned s = sum;
-	  sum += counts[i];
-	  counts[i] = s;
-	}
-
-      // Place all elements.
-      for (unsigned i = 0; i < n;)
+  i2 = v2->count;
+  if (i2 > 0)
+    {
+      i1 = v1->count;
+      do
 	{
-	  unsigned chunk = ((n - i) <= BLOCKSIZE) ? (n - i) : BLOCKSIZE;
-	  fde_extractor (ob, ptrs, a1 + i, chunk);
-	  for (unsigned j = 0; j < chunk; ++j)
+	  i2--;
+	  fde2 = v2->array[i2];
+	  while (i1 > 0 && fde_compare (ob, v1->array[i1-1], fde2) > 0)
 	    {
-	      unsigned b = (ptrs[j] >> (round * FANOUTBITS)) & (FANOUT - 1);
-	      a2[counts[b]++] = a1[i + j];
+	      v1->array[i1+i2] = v1->array[i1-1];
+	      i1--;
 	    }
-	  i += chunk;
+	  v1->array[i1+i2] = fde2;
 	}
-
-      // Swap a1 and a2.
-      const fde **tmp = a1;
-      a1 = a2;
-      a2 = tmp;
-    }
-#undef BLOCKSIZE
-#undef FANOUT
-#undef FANOUTBITS
-
-  // The data is in a1 now, move in place if needed.
-  if (a1 != v1->array)
-    memcpy (v1->array, a1, sizeof (const fde *) * n);
+      while (i2 > 0);
+      v1->count += v2->count;
+    }
 }
 
 static inline void
 end_fde_sort (struct object *ob, struct fde_accumulator *accu, size_t count)
 {
+  fde_compare_t fde_compare;
+
   gcc_assert (!accu->linear || accu->linear->count == count);
 
-  if (accu->aux)
-    {
-      fde_extractor_t fde_extractor;
-      if (ob->s.b.mixed_encoding)
-	fde_extractor = fde_mixed_encoding_extract;
-      else if (ob->s.b.encoding == DW_EH_PE_absptr)
-	fde_extractor = fde_unencoded_extract;
-      else
-	fde_extractor = fde_single_encoding_extract;
+  if (ob->s.b.mixed_encoding)
+    fde_compare = fde_mixed_encoding_compare;
+  else if (ob->s.b.encoding == DW_EH_PE_absptr)
+    fde_compare = fde_unencoded_compare;
+  else
+    fde_compare = fde_single_encoding_compare;
 
-      fde_radixsort (ob, fde_extractor, accu->linear, accu->aux);
-      free (accu->aux);
+  if (accu->erratic)
+    {
+      fde_split (ob, fde_compare, accu->linear, accu->erratic);
+      gcc_assert (accu->linear->count + accu->erratic->count == count);
+      frame_heapsort (ob, fde_compare, accu->erratic);
+      fde_merge (ob, fde_compare, accu->linear, accu->erratic);
+      free (accu->erratic);
     }
   else
     {
-      fde_compare_t fde_compare;
-      if (ob->s.b.mixed_encoding)
-	fde_compare = fde_mixed_encoding_compare;
-      else if (ob->s.b.encoding == DW_EH_PE_absptr)
-	fde_compare = fde_unencoded_compare;
-      else
-	fde_compare = fde_single_encoding_compare;
-
-      /* We've not managed to malloc an aux array,
+      /* We've not managed to malloc an erratic array,
 	 so heap sort in the linear one.  */
       frame_heapsort (ob, fde_compare, accu->linear);
     }
 }
 
-/* Inspect the fde array beginning at this_fde. This
-   function can be used either in query mode (RANGE is
-   not null, OB is const), or in update mode (RANGE is
-   null, OB is modified). In query mode the function computes
-   the range of PC values and stores it in RANGE. In
-   update mode it updates encoding, mixed_encoding, and pc_begin
-   for OB. Return the number of fdes encountered along the way. */
+
+/* Update encoding, mixed_encoding, and pc_begin for OB for the
+   fde array beginning at THIS_FDE.  Return the number of fdes
+   encountered along the way.  */
 
 static size_t
-classify_object_over_fdes (struct object *ob, const fde *this_fde,
-			   uintptr_type *range)
+classify_object_over_fdes (struct object *ob, const fde *this_fde)
 {
   const struct dwarf_cie *last_cie = 0;
   size_t count = 0;
@@ -748,18 +659,14 @@ encoding = get_cie_encoding (this_cie);
 	  if (encoding == DW_EH_PE_omit)
 	    return -1;
 	  base = base_from_object (encoding, ob);
-	  if (!range)
-	    {
-	      if (ob->s.b.encoding == DW_EH_PE_omit)
-		ob->s.b.encoding = encoding;
-	      else if (ob->s.b.encoding != encoding)
-		ob->s.b.mixed_encoding = 1;
-	    }
+	  if (ob->s.b.encoding == DW_EH_PE_omit)
+	    ob->s.b.encoding = encoding;
+	  else if (ob->s.b.encoding != encoding)
+	    ob->s.b.mixed_encoding = 1;
 	}
 
-      const unsigned char *p;
-      p = read_encoded_value_with_base (encoding, base, this_fde->pc_begin,
-					&pc_begin);
+      read_encoded_value_with_base (encoding, base, this_fde->pc_begin,
+				    &pc_begin);
 
       /* Take care to ignore link-once functions that were removed.
 	 In these cases, the function address will be NULL, but if
@@ -775,29 +682,8 @@ if ((pc_begin & mask) == 0)
 	continue;
 
       count += 1;
-      if (range)
-	{
-	  _Unwind_Ptr pc_range, pc_end;
-	  read_encoded_value_with_base (encoding & 0x0F, 0, p, &pc_range);
-	  pc_end = pc_begin + pc_range;
-	  if ((!range[0]) && (!range[1]))
-	    {
-	      range[0] = pc_begin;
-	      range[1] = pc_end;
-	    }
-	  else
-	    {
-	      if (pc_begin < range[0])
-		range[0] = pc_begin;
-	      if (pc_end > range[1])
-		range[1] = pc_end;
-	    }
-	}
-      else
-	{
-	  if ((void *) pc_begin < ob->pc_begin)
-	    ob->pc_begin = (void *) pc_begin;
-	}
+      if ((void *) pc_begin < ob->pc_begin)
+	ob->pc_begin = (void *) pc_begin;
     }
 
   return count;
@@ -882,7 +768,7 @@ {
 	  fde **p = ob->u.array;
 	  for (count = 0; *p; ++p)
 	    {
-	      size_t cur_count = classify_object_over_fdes (ob, *p, NULL);
+	      size_t cur_count = classify_object_over_fdes (ob, *p);
 	      if (cur_count == (size_t) -1)
 		goto unhandled_fdes;
 	      count += cur_count;
@@ -890,7 +776,7 @@ }
 	}
       else
 	{
-	  count = classify_object_over_fdes (ob, ob->u.single, NULL);
+	  count = classify_object_over_fdes (ob, ob->u.single);
 	  if (count == (size_t) -1)
 	    {
 	      static const fde terminator;
@@ -931,42 +817,8 @@ DSO will deregister the object.  */
   accu.linear->orig_data = ob->u.single;
   ob->u.sort = accu.linear;
 
-#ifdef ATOMIC_FDE_FAST_PATH
-  // We must update the sorted bit with an atomic operation
-  struct object tmp;
-  tmp.s.b = ob->s.b;
-  tmp.s.b.sorted = 1;
-  __atomic_store (&(ob->s.b), &(tmp.s.b), __ATOMIC_RELEASE);
-#else
   ob->s.b.sorted = 1;
-#endif
-}
-
-#ifdef ATOMIC_FDE_FAST_PATH
-/* Get the PC range for lookup */
-static void
-get_pc_range (const struct object *ob, uintptr_type *range)
-{
-  // It is safe to cast to non-const object* here as
-  // classify_object_over_fdes does not modify ob in query mode.
-  struct object *ncob = (struct object *) (uintptr_type) ob;
-  range[0] = range[1] = 0;
-  if (ob->s.b.sorted)
-    {
-      classify_object_over_fdes (ncob, ob->u.sort->orig_data, range);
-    }
-  else if (ob->s.b.from_array)
-    {
-      fde **p = ob->u.array;
-      for (; *p; ++p)
-	classify_object_over_fdes (ncob, *p, range);
-    }
-  else
-    {
-      classify_object_over_fdes (ncob, ob->u.single, range);
-    }
 }
-#endif
 
 /* A linear search through a set of FDEs for the given PC.  This is
    used when there was insufficient memory to allocate and sort an
@@ -1132,9 +984,6 @@ }
 static const fde *
 search_object (struct object* ob, void *pc)
 {
-  /* The fast path initializes objects eagerly to avoid locking.
-   * On the slow path we initialize them now */
-#ifndef ATOMIC_FDE_FAST_PATH
   /* If the data hasn't been sorted, try to do this now.  We may have
      more memory available than last time we tried.  */
   if (! ob->s.b.sorted)
@@ -1147,7 +996,6 @@ check is in order.  */
       if (pc < ob->pc_begin)
 	return NULL;
     }
-#endif
 
   if (ob->s.b.sorted)
     {
@@ -1177,21 +1025,6 @@ return linear_search_fdes (ob, ob->u.sin
     }
 }
 
-#ifdef ATOMIC_FDE_FAST_PATH
-
-// Check if the object was already initialized
-static inline bool
-is_object_initialized (struct object *ob)
-{
-  // We have to use acquire atomics for the read, which
-  // is a bit involved as we read from a bitfield
-  struct object tmp;
-  __atomic_load (&(ob->s.b), &(tmp.s.b), __ATOMIC_ACQUIRE);
-  return tmp.s.b.sorted;
-}
-
-#endif
-
 const fde *
 _Unwind_Find_FDE (void *pc, struct dwarf_eh_bases *bases)
 {
@@ -1199,27 +1032,17 @@ struct object *ob;
   const fde *f = NULL;
 
 #ifdef ATOMIC_FDE_FAST_PATH
-  ob = btree_lookup (&registered_frames, (uintptr_type) pc);
-  if (!ob)
+  /* For targets where unwind info is usually not registered through these
+     APIs anymore, avoid taking a global lock.
+     Use relaxed MO here, it is up to the app to ensure that the library
+     loading/initialization happens-before using that library in other
+     threads (in particular unwinding with that library's functions
+     appearing in the backtraces).  Calling that library's functions
+     without waiting for the library to initialize would be racy.  */
+  if (__builtin_expect (!__atomic_load_n (&any_objects_registered,
+					  __ATOMIC_RELAXED), 1))
     return NULL;
-
-  // Initialize the object lazily
-  if (!is_object_initialized (ob))
-    {
-      // Check again under mutex
-      init_object_mutex_once ();
-      __gthread_mutex_lock (&object_mutex);
-
-      if (!ob->s.b.sorted)
-	{
-	  init_object (ob);
-	}
-
-      __gthread_mutex_unlock (&object_mutex);
-    }
-
-  f = search_object (ob, pc);
-#else
+#endif
 
   init_object_mutex_once ();
   __gthread_mutex_lock (&object_mutex);
@@ -1257,7 +1080,6 @@ }
 
  fini:
   __gthread_mutex_unlock (&object_mutex);
-#endif
 
   if (f)
     {
--- gcc-13.4.0/libgcc/unwind-dw2-fde.h
+++ gcc-13.4.0/libgcc/unwind-dw2-fde.h
@@ -166,7 +166,7 @@ }
 extern const fde * _Unwind_Find_FDE (void *, struct dwarf_eh_bases *);
 
 static inline int
-last_fde (const struct object *obj __attribute__ ((__unused__)), const fde *f)
+last_fde (struct object *obj __attribute__ ((__unused__)), const fde *f)
 {
 #ifdef DWARF2_OBJECT_END_PTR_EXTENSION
   return f == (const fde *) obj->fde_end || f->length == 0;
--- gcc-releases-gcc-13.4.0/Makefile.in.orig	2022-02-03 15:40:04.977800946 +0000
+++ gcc-releases-gcc-13.4.0/Makefile.in	2022-02-03 15:40:06.128526945 +0000
@@ -364,10 +364,10 @@
 AR_FOR_BUILD = @AR_FOR_BUILD@
 AS_FOR_BUILD = @AS_FOR_BUILD@
 CC_FOR_BUILD = @CC_FOR_BUILD@
-CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ @CPU_FLAGS@
 CPP_FOR_BUILD = @CPP_FOR_BUILD@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
+CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@ @CPU_FLAGS@
 CXX_FOR_BUILD = @CXX_FOR_BUILD@
 DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
 DSYMUTIL_FOR_BUILD = @DSYMUTIL_FOR_BUILD@
@@ -389,7 +389,7 @@
 
 # Flags to pass to stage2 and later makes.  They are defined
 # here so that they can be overridden by Makefile fragments.
-BOOT_CFLAGS= -g -O2
+BOOT_CFLAGS= -g -O2 -m64 @CPU_FLAGS@
 BOOT_LDFLAGS=
 BOOT_ADAFLAGS= -gnatpg
 
@@ -438,10 +438,10 @@
 GNATBIND = @GNATBIND@
 GNATMAKE = @GNATMAKE@
 
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @CPU_FLAGS@
 LDFLAGS = @LDFLAGS@
 LIBCFLAGS = $(CFLAGS)
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ @CPU_FLAGS@
 LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
 GOCFLAGS = $(CFLAGS)
 GDCFLAGS = $(CFLAGS)
@@ -3146,8 +3146,7 @@
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS)  \
 	(cd $(BUILD_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)   \
-		$(TARGET-build-libiberty))
+	  $(MAKE) $(TARGET-build-libiberty))
 @endif build-libiberty
 
 
@@ -3431,8 +3430,7 @@
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS)  \
 	(cd $(BUILD_SUBDIR)/fixincludes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)   \
-		$(TARGET-build-fixincludes))
+	  $(MAKE) $(TARGET-build-fixincludes))
 @endif build-fixincludes
 
 
@@ -3488,8 +3486,7 @@
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS)  \
 	(cd $(BUILD_SUBDIR)/libcpp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)   \
-		$(TARGET-build-libcpp))
+	  $(MAKE) $(TARGET-build-libcpp))
 @endif build-libcpp
 
 
@@ -13151,8 +13148,9 @@
 	$(SHELL) \
 	  $$s/$$module_srcdir/configure \
 	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} --disable-shared LEX="touch lex.yy.c" @host_libs_picflag@ \
+	  $(HOST_CONFIGARGS) --build=@gmp_alias@ --host=@gmp_alias@ --target=@gmp_alias@ \
+	  --disable-shared ABI=64 CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+	  LEX="touch lex.yy.c" @host_libs_picflag@ \
 	  || exit 1
 @endif gmp
 
@@ -13170,9 +13168,9 @@
 	TFLAGS="$(STAGE1_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/gmp; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
 	cd $(HOST_SUBDIR)/gmp || exit 1; \
@@ -13184,11 +13182,9 @@
 	module_srcdir=gmp; \
 	$(SHELL) $$s/$$module_srcdir/configure \
 	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} \
-	   \
-	  $(STAGE1_CONFIGURE_FLAGS) \
-	  --disable-shared LEX="touch lex.yy.c" @host_libs_picflag@
+	  $(HOST_CONFIGARGS) --build=@gmp_alias@ --host=@gmp_alias@ --target=@gmp_alias@ \
+	  $(STAGE1_CONFIGURE_FLAGS) --disable-shared ABI=64 \
+	  CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" LEX="touch lex.yy.c" @host_libs_picflag@
 @endif gmp-bootstrap
 
 .PHONY: configure-stage2-gmp maybe-configure-stage2-gmp
@@ -13204,9 +13200,9 @@
 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage 2 in $(HOST_SUBDIR)/gmp; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
 	cd $(HOST_SUBDIR)/gmp || exit 1; \
@@ -13218,11 +13214,10 @@
 	module_srcdir=gmp; \
 	$(SHELL) $$s/$$module_srcdir/configure \
 	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGE2_CONFIGURE_FLAGS) \
-	  --disable-shared LEX="touch lex.yy.c" @host_libs_picflag@
+	  $(HOST_CONFIGARGS) --build=@gmp_alias@ --host=@gmp_alias@ --target=@gmp_alias@ \
+	  --with-build-libsubdir=$(HOST_SUBDIR) $(STAGE2_CONFIGURE_FLAGS) \
+	  --disable-shared ABI=64 CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+	  LEX="touch lex.yy.c" @host_libs_picflag@
 @endif gmp-bootstrap
 
 .PHONY: configure-stage3-gmp maybe-configure-stage3-gmp
@@ -13238,9 +13233,9 @@
 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage 3 in $(HOST_SUBDIR)/gmp; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
 	cd $(HOST_SUBDIR)/gmp || exit 1; \
@@ -13252,11 +13247,10 @@
 	module_srcdir=gmp; \
 	$(SHELL) $$s/$$module_srcdir/configure \
 	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGE3_CONFIGURE_FLAGS) \
-	  --disable-shared LEX="touch lex.yy.c" @host_libs_picflag@
+	  $(HOST_CONFIGARGS) --build=@gmp_alias@ --host=@gmp_alias@ --target=@gmp_alias@ \
+	  --with-build-libsubdir=$(HOST_SUBDIR) $(STAGE3_CONFIGURE_FLAGS) \
+	  --disable-shared ABI=64 CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+	  LEX="touch lex.yy.c" @host_libs_picflag@
 @endif gmp-bootstrap
 
 .PHONY: configure-stage4-gmp maybe-configure-stage4-gmp
@@ -13272,9 +13266,9 @@
 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage 4 in $(HOST_SUBDIR)/gmp; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
 	cd $(HOST_SUBDIR)/gmp || exit 1; \
@@ -13286,11 +13280,10 @@
 	module_srcdir=gmp; \
 	$(SHELL) $$s/$$module_srcdir/configure \
 	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGE4_CONFIGURE_FLAGS) \
-	  --disable-shared LEX="touch lex.yy.c" @host_libs_picflag@
+	  $(HOST_CONFIGARGS) --build=@gmp_alias@ --host=@gmp_alias@ --target=@gmp_alias@ \
+	  --with-build-libsubdir=$(HOST_SUBDIR) $(STAGE4_CONFIGURE_FLAGS) \
+	  --disable-shared ABI=64 CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+	  LEX="touch lex.yy.c" @host_libs_picflag@
 @endif gmp-bootstrap
 
 .PHONY: configure-stageprofile-gmp maybe-configure-stageprofile-gmp
@@ -13306,9 +13299,9 @@
 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage profile in $(HOST_SUBDIR)/gmp; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
 	cd $(HOST_SUBDIR)/gmp || exit 1; \
@@ -13320,11 +13313,10 @@
 	module_srcdir=gmp; \
 	$(SHELL) $$s/$$module_srcdir/configure \
 	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEprofile_CONFIGURE_FLAGS) \
-	  --disable-shared LEX="touch lex.yy.c" @host_libs_picflag@
+	  $(HOST_CONFIGARGS) --build=@gmp_alias@ --host=@gmp_alias@ --target=@gmp_alias@ \
+	  --with-build-libsubdir=$(HOST_SUBDIR) $(STAGEprofile_CONFIGURE_FLAGS) \
+	  --disable-shared ABI=64 CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+	  LEX="touch lex.yy.c" @host_libs_picflag@
 @endif gmp-bootstrap
 
 .PHONY: configure-stagetrain-gmp maybe-configure-stagetrain-gmp
@@ -13340,9 +13332,9 @@
 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage train in $(HOST_SUBDIR)/gmp; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
 	cd $(HOST_SUBDIR)/gmp || exit 1; \
@@ -13354,11 +13346,10 @@
 	module_srcdir=gmp; \
 	$(SHELL) $$s/$$module_srcdir/configure \
 	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS) \
-	  --disable-shared LEX="touch lex.yy.c" @host_libs_picflag@
+	  $(HOST_CONFIGARGS) --build=@gmp_alias@ --host=@gmp_alias@ --target=@gmp_alias@ \
+	  --with-build-libsubdir=$(HOST_SUBDIR) $(STAGEtrain_CONFIGURE_FLAGS) \
+	  --disable-shared ABI=64 CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+	  LEX="touch lex.yy.c" @host_libs_picflag@
 @endif gmp-bootstrap
 
 .PHONY: configure-stagefeedback-gmp maybe-configure-stagefeedback-gmp
@@ -13374,9 +13365,9 @@
 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage feedback in $(HOST_SUBDIR)/gmp; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
 	cd $(HOST_SUBDIR)/gmp || exit 1; \
@@ -13388,11 +13379,10 @@
 	module_srcdir=gmp; \
 	$(SHELL) $$s/$$module_srcdir/configure \
 	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEfeedback_CONFIGURE_FLAGS) \
-	  --disable-shared LEX="touch lex.yy.c" @host_libs_picflag@
+	  $(HOST_CONFIGARGS) --build=@gmp_alias@ --host=@gmp_alias@ --target=@gmp_alias@ \
+	  --with-build-libsubdir=$(HOST_SUBDIR) $(STAGEfeedback_CONFIGURE_FLAGS) \
+	  --disable-shared ABI=64 CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+	  LEX="touch lex.yy.c" @host_libs_picflag@
 @endif gmp-bootstrap
 
 .PHONY: configure-stageautoprofile-gmp maybe-configure-stageautoprofile-gmp
@@ -13408,9 +13398,9 @@
 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage autoprofile in $(HOST_SUBDIR)/gmp; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
 	cd $(HOST_SUBDIR)/gmp || exit 1; \
@@ -13422,11 +13412,10 @@
 	module_srcdir=gmp; \
 	$(SHELL) $$s/$$module_srcdir/configure \
 	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS) \
-	  --disable-shared LEX="touch lex.yy.c" @host_libs_picflag@
+	  $(HOST_CONFIGARGS) --build=@gmp_alias@ --host=@gmp_alias@ --target=@gmp_alias@ \
+	  --with-build-libsubdir=$(HOST_SUBDIR) $(STAGEautoprofile_CONFIGURE_FLAGS) \
+	  --disable-shared ABI=64 CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+	  LEX="touch lex.yy.c" @host_libs_picflag@
 @endif gmp-bootstrap
 
 .PHONY: configure-stageautofeedback-gmp maybe-configure-stageautofeedback-gmp
@@ -13442,9 +13431,9 @@
 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage autofeedback in $(HOST_SUBDIR)/gmp; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
 	cd $(HOST_SUBDIR)/gmp || exit 1; \
@@ -13456,11 +13445,10 @@
 	module_srcdir=gmp; \
 	$(SHELL) $$s/$$module_srcdir/configure \
 	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS) \
-	  --disable-shared LEX="touch lex.yy.c" @host_libs_picflag@
+	  $(HOST_CONFIGARGS) --build=@gmp_alias@ --host=@gmp_alias@ --target=@gmp_alias@ \
+	  --with-build-libsubdir=$(HOST_SUBDIR) $(STAGEautofeedback_CONFIGURE_FLAGS) \
+	  --disable-shared ABI=64 CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+	  LEX="touch lex.yy.c" @host_libs_picflag@
 @endif gmp-bootstrap
 
 
@@ -13480,7 +13468,7 @@
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS)  \
 	(cd $(HOST_SUBDIR)/gmp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		$(TARGET-gmp))
 @endif gmp
 
@@ -13503,15 +13491,15 @@
 	cd $(HOST_SUBDIR)/gmp && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
-		LIBCFLAGS="$(LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CXXFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		LIBCFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
 		$(EXTRA_HOST_FLAGS)  \
-		$(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+		$(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		TFLAGS="$(STAGE1_TFLAGS)"  \
 		$(TARGET-stage1-gmp)
 
@@ -13526,7 +13514,7 @@
 	fi; \
 	cd $(HOST_SUBDIR)/gmp && \
 	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-	$(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
+	$(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="" clean
 @endif gmp-bootstrap
 
 
@@ -13548,14 +13536,14 @@
 	cd $(HOST_SUBDIR)/gmp && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGE2_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+		CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CXXFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		LIBCFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		TFLAGS="$(STAGE2_TFLAGS)"  \
 		$(TARGET-stage2-gmp)
 
@@ -13569,7 +13557,7 @@
 	  $(MAKE) stage2-start; \
 	fi; \
 	cd $(HOST_SUBDIR)/gmp && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
+	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" clean
 @endif gmp-bootstrap
 
 
@@ -13591,14 +13579,14 @@
 	cd $(HOST_SUBDIR)/gmp && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGE3_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+		CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CXXFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		LIBCFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		TFLAGS="$(STAGE3_TFLAGS)"  \
 		$(TARGET-stage3-gmp)
 
@@ -13612,7 +13600,7 @@
 	  $(MAKE) stage3-start; \
 	fi; \
 	cd $(HOST_SUBDIR)/gmp && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
+	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" clean
 @endif gmp-bootstrap
 
 
@@ -13634,14 +13622,14 @@
 	cd $(HOST_SUBDIR)/gmp && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+		CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CXXFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		LIBCFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		TFLAGS="$(STAGE4_TFLAGS)"  \
 		$(TARGET-stage4-gmp)
 
@@ -13655,7 +13643,7 @@
 	  $(MAKE) stage4-start; \
 	fi; \
 	cd $(HOST_SUBDIR)/gmp && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
+	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" clean
 @endif gmp-bootstrap
 
 
@@ -13677,14 +13665,14 @@
 	cd $(HOST_SUBDIR)/gmp && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+		CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CXXFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		LIBCFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		TFLAGS="$(STAGEprofile_TFLAGS)"  \
 		$(TARGET-stageprofile-gmp)
 
@@ -13698,7 +13686,7 @@
 	  $(MAKE) stageprofile-start; \
 	fi; \
 	cd $(HOST_SUBDIR)/gmp && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
+	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" clean
 @endif gmp-bootstrap
 
 
@@ -13720,14 +13708,14 @@
 	cd $(HOST_SUBDIR)/gmp && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+		CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CXXFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		LIBCFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		TFLAGS="$(STAGEtrain_TFLAGS)"  \
 		$(TARGET-stagetrain-gmp)
 
@@ -13741,7 +13729,7 @@
 	  $(MAKE) stagetrain-start; \
 	fi; \
 	cd $(HOST_SUBDIR)/gmp && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
+	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" clean
 @endif gmp-bootstrap
 
 
@@ -13763,14 +13751,14 @@
 	cd $(HOST_SUBDIR)/gmp && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+		CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CXXFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		LIBCFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		TFLAGS="$(STAGEfeedback_TFLAGS)"  \
 		$(TARGET-stagefeedback-gmp)
 
@@ -13784,7 +13772,7 @@
 	  $(MAKE) stagefeedback-start; \
 	fi; \
 	cd $(HOST_SUBDIR)/gmp && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
+	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" clean
 @endif gmp-bootstrap
 
 
@@ -13806,14 +13794,14 @@
 	cd $(HOST_SUBDIR)/gmp && \
 	$$s/gcc/config/i386/$(AUTO_PROFILE) \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+		CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CXXFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		LIBCFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
 		$(TARGET-stageautoprofile-gmp)
 
@@ -13827,7 +13815,7 @@
 	  $(MAKE) stageautoprofile-start; \
 	fi; \
 	cd $(HOST_SUBDIR)/gmp && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
+	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" clean
 @endif gmp-bootstrap
 
 
@@ -13849,14 +13837,14 @@
 	cd $(HOST_SUBDIR)/gmp && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+		CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CXXFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		LIBCFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O3 -m64 -pedantic @CPU_FLAGS@" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
 		$(TARGET-stageautofeedback-gmp)
 
@@ -13870,7 +13858,7 @@
 	  $(MAKE) stageautofeedback-start; \
 	fi; \
 	cd $(HOST_SUBDIR)/gmp && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
+	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" clean
 @endif gmp-bootstrap
 
 
@@ -13888,7 +13876,7 @@
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/gmp && \
-	  $(MAKE) $(FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" $(EXTRA_BOOTSTRAP_FLAGS) check)
+	  $(MAKE) $(FLAGS_TO_PASS) AM_CFLAGS="" $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif gmp
 
@@ -13923,7 +13911,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing info in gmp"; \
@@ -13948,7 +13936,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing dvi in gmp"; \
@@ -13973,7 +13961,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing pdf in gmp"; \
@@ -13998,7 +13986,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing html in gmp"; \
@@ -14023,7 +14011,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing TAGS in gmp"; \
@@ -14049,7 +14037,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing install-info in gmp"; \
@@ -14101,7 +14089,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing install-pdf in gmp"; \
@@ -14127,7 +14115,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing install-html in gmp"; \
@@ -14152,7 +14140,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing installcheck in gmp"; \
@@ -14176,7 +14164,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing mostlyclean in gmp"; \
@@ -14200,7 +14188,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing clean in gmp"; \
@@ -14224,7 +14212,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing distclean in gmp"; \
@@ -14248,7 +14236,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing maintainer-clean in gmp"; \
@@ -14277,6 +14265,7 @@
 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
 	$(HOST_EXPORTS)  \
+	CFLAGS="-O2 -m64 @CPU_FLAGS@"; export CFLAGS; \
 	echo Configuring in $(HOST_SUBDIR)/mpfr; \
 	cd "$(HOST_SUBDIR)/mpfr" || exit 1; \
 	case $(srcdir) in \
@@ -14307,9 +14296,9 @@
 	TFLAGS="$(STAGE1_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O2 -m64 @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O2 -m64 @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O2 -m64 @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
@@ -14341,9 +14330,9 @@
 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O2 -m64 @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O2 -m64 @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O2 -m64 @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage 2 in $(HOST_SUBDIR)/mpfr; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
@@ -14354,6 +14343,7 @@
 	esac; \
 	module_srcdir=mpfr; \
 	$(SHELL) $$s/$$module_srcdir/configure \
+	  CFLAGS="-O2 -m64 @CPU_FLAGS@" \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} \
@@ -14375,9 +14365,9 @@
 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O2 -m64 @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O2 -m64 @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O2 -m64 @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage 3 in $(HOST_SUBDIR)/mpfr; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
@@ -14388,6 +14378,7 @@
 	esac; \
 	module_srcdir=mpfr; \
 	$(SHELL) $$s/$$module_srcdir/configure \
+	  CFLAGS="-O2 -m64 @CPU_FLAGS@" \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} \
@@ -14409,9 +14400,9 @@
 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O2 -m64 @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O2 -m64 @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O2 -m64 @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage 4 in $(HOST_SUBDIR)/mpfr; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
@@ -14422,6 +14413,7 @@
 	esac; \
 	module_srcdir=mpfr; \
 	$(SHELL) $$s/$$module_srcdir/configure \
+	  CFLAGS="-O2 -m64 @CPU_FLAGS@" \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} \
@@ -14443,9 +14435,9 @@
 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O2 -m64 @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O2 -m64 @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O2 -m64 @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage profile in $(HOST_SUBDIR)/mpfr; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
@@ -14456,6 +14448,7 @@
 	esac; \
 	module_srcdir=mpfr; \
 	$(SHELL) $$s/$$module_srcdir/configure \
+	  CFLAGS="-O2 -m64 @CPU_FLAGS@" \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} \
@@ -14477,9 +14470,9 @@
 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O2 -m64 @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O2 -m64 @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O2 -m64 @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage train in $(HOST_SUBDIR)/mpfr; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
@@ -14490,6 +14483,7 @@
 	esac; \
 	module_srcdir=mpfr; \
 	$(SHELL) $$s/$$module_srcdir/configure \
+	  CFLAGS="-O2 -m64 @CPU_FLAGS@" \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} \
@@ -14511,9 +14505,9 @@
 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O2 -m64 @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O2 -m64 @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O2 -m64 @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage feedback in $(HOST_SUBDIR)/mpfr; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
@@ -14524,6 +14518,7 @@
 	esac; \
 	module_srcdir=mpfr; \
 	$(SHELL) $$s/$$module_srcdir/configure \
+	  CFLAGS="-O2 -m64 @CPU_FLAGS@" \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} \
@@ -14545,9 +14540,9 @@
 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O2 -m64 @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O2 -m64 @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O2 -m64 @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage autoprofile in $(HOST_SUBDIR)/mpfr; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
@@ -14558,6 +14553,7 @@
 	esac; \
 	module_srcdir=mpfr; \
 	$(SHELL) $$s/$$module_srcdir/configure \
+	  CFLAGS="-O2 -m64 @CPU_FLAGS@" \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} \
@@ -14579,9 +14575,9 @@
 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O2 -m64 @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O2 -m64 @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O2 -m64 @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage autofeedback in $(HOST_SUBDIR)/mpfr; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
@@ -14592,6 +14588,7 @@
 	esac; \
 	module_srcdir=mpfr; \
 	$(SHELL) $$s/$$module_srcdir/configure \
+	  CFLAGS="-O2 -m64 @CPU_FLAGS@" \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} \
@@ -14617,7 +14614,7 @@
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS)  \
 	(cd $(HOST_SUBDIR)/mpfr && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		$(TARGET-mpfr))
 @endif mpfr
 
@@ -14640,15 +14637,15 @@
 	cd $(HOST_SUBDIR)/mpfr && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
-		LIBCFLAGS="$(LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		CXXFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
 		$(EXTRA_HOST_FLAGS)  \
-		$(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+		$(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		TFLAGS="$(STAGE1_TFLAGS)"  \
 		$(TARGET-stage1-mpfr)
 
@@ -14663,7 +14660,7 @@
 	fi; \
 	cd $(HOST_SUBDIR)/mpfr && \
 	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-	$(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
+	$(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="" clean
 @endif mpfr-bootstrap
 
 
@@ -14685,14 +14682,14 @@
 	cd $(HOST_SUBDIR)/mpfr && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGE2_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+		CFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		CXXFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		TFLAGS="$(STAGE2_TFLAGS)"  \
 		$(TARGET-stage2-mpfr)
 
@@ -14706,7 +14703,7 @@
 	  $(MAKE) stage2-start; \
 	fi; \
 	cd $(HOST_SUBDIR)/mpfr && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
+	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" clean
 @endif mpfr-bootstrap
 
 
@@ -14728,14 +14725,14 @@
 	cd $(HOST_SUBDIR)/mpfr && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGE3_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+		CFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="" \
+		CXXFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		TFLAGS="$(STAGE3_TFLAGS)"  \
 		$(TARGET-stage3-mpfr)
 
@@ -14749,7 +14746,7 @@
 	  $(MAKE) stage3-start; \
 	fi; \
 	cd $(HOST_SUBDIR)/mpfr && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
+	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" clean
 @endif mpfr-bootstrap
 
 
@@ -14771,14 +14768,14 @@
 	cd $(HOST_SUBDIR)/mpfr && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+		CFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="" \
+		CXXFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		TFLAGS="$(STAGE4_TFLAGS)"  \
 		$(TARGET-stage4-mpfr)
 
@@ -14792,7 +14789,7 @@
 	  $(MAKE) stage4-start; \
 	fi; \
 	cd $(HOST_SUBDIR)/mpfr && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
+	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" clean
 @endif mpfr-bootstrap
 
 
@@ -14814,14 +14811,14 @@
 	cd $(HOST_SUBDIR)/mpfr && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+		CFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="" \
+		CXXFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		TFLAGS="$(STAGEprofile_TFLAGS)"  \
 		$(TARGET-stageprofile-mpfr)
 
@@ -14835,7 +14832,7 @@
 	  $(MAKE) stageprofile-start; \
 	fi; \
 	cd $(HOST_SUBDIR)/mpfr && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
+	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" clean
 @endif mpfr-bootstrap
 
 
@@ -14857,14 +14854,14 @@
 	cd $(HOST_SUBDIR)/mpfr && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+		CFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="" \
+		CXXFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		TFLAGS="$(STAGEtrain_TFLAGS)"  \
 		$(TARGET-stagetrain-mpfr)
 
@@ -14878,7 +14875,7 @@
 	  $(MAKE) stagetrain-start; \
 	fi; \
 	cd $(HOST_SUBDIR)/mpfr && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
+	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" clean
 @endif mpfr-bootstrap
 
 
@@ -14900,14 +14897,14 @@
 	cd $(HOST_SUBDIR)/mpfr && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+		CFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="" \
+		CXXFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		TFLAGS="$(STAGEfeedback_TFLAGS)"  \
 		$(TARGET-stagefeedback-mpfr)
 
@@ -14921,7 +14918,7 @@
 	  $(MAKE) stagefeedback-start; \
 	fi; \
 	cd $(HOST_SUBDIR)/mpfr && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
+	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" clean
 @endif mpfr-bootstrap
 
 
@@ -14943,14 +14940,14 @@
 	cd $(HOST_SUBDIR)/mpfr && \
 	$$s/gcc/config/i386/$(AUTO_PROFILE) \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+		CFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="" \
+		CXXFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
 		$(TARGET-stageautoprofile-mpfr)
 
@@ -14964,7 +14961,7 @@
 	  $(MAKE) stageautoprofile-start; \
 	fi; \
 	cd $(HOST_SUBDIR)/mpfr && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
+	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" clean
 @endif mpfr-bootstrap
 
 
@@ -14986,14 +14983,14 @@
 	cd $(HOST_SUBDIR)/mpfr && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+		CFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="" \
+		CXXFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS="-O2 -m64 @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O2 -m64 @CPU_FLAGS@" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" \
 		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
 		$(TARGET-stageautofeedback-mpfr)
 
@@ -15007,7 +15004,7 @@
 	  $(MAKE) stageautofeedback-start; \
 	fi; \
 	cd $(HOST_SUBDIR)/mpfr && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
+	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="" clean
 @endif mpfr-bootstrap
 
 
@@ -15025,7 +15022,7 @@
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/mpfr && \
-	  $(MAKE) $(FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" $(EXTRA_BOOTSTRAP_FLAGS) check)
+	  $(MAKE) $(FLAGS_TO_PASS) AM_CFLAGS="" $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif mpfr
 
@@ -15060,7 +15057,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing info in mpfr"; \
@@ -15085,7 +15082,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing dvi in mpfr"; \
@@ -15110,7 +15107,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing pdf in mpfr"; \
@@ -15135,7 +15132,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing html in mpfr"; \
@@ -15160,7 +15157,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing TAGS in mpfr"; \
@@ -15186,7 +15183,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing install-info in mpfr"; \
@@ -15238,7 +15235,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing install-pdf in mpfr"; \
@@ -15264,7 +15261,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing install-html in mpfr"; \
@@ -15289,7 +15286,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing installcheck in mpfr"; \
@@ -15313,7 +15310,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing mostlyclean in mpfr"; \
@@ -15337,7 +15334,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing clean in mpfr"; \
@@ -15361,7 +15358,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing distclean in mpfr"; \
@@ -15385,7 +15382,7 @@
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
+	for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS=""; do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
 	echo "Doing maintainer-clean in mpfr"; \
@@ -15414,6 +15411,7 @@
 	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
 	$(HOST_EXPORTS)  \
+	CFLAGS="-O3 -m64 @CPU_FLAGS@"; export CFLAGS; \
 	echo Configuring in $(HOST_SUBDIR)/mpc; \
 	cd "$(HOST_SUBDIR)/mpc" || exit 1; \
 	case $(srcdir) in \
@@ -15424,6 +15422,7 @@
 	module_srcdir=mpc; \
 	$(SHELL) \
 	  $$s/$$module_srcdir/configure \
+	  CFLAGS="-O3 -m64 @CPU_FLAGS@" \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@  @host_libs_picflag@ --disable-maintainer-mode \
@@ -15444,9 +15443,9 @@
 	TFLAGS="$(STAGE1_TFLAGS)"; \
 	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
-	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O3 -m64 @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O3 -m64 @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O3 -m64 @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/mpc; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
 	cd $(HOST_SUBDIR)/mpc || exit 1; \
@@ -15457,10 +15456,10 @@
 	esac; \
 	module_srcdir=mpc; \
 	$(SHELL) $$s/$$module_srcdir/configure \
+	  CFLAGS="-O3 -m64 @CPU_FLAGS@" \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} \
-	   \
 	  $(STAGE1_CONFIGURE_FLAGS) \
 	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@  @host_libs_picflag@ --disable-maintainer-mode
 @endif mpc-bootstrap
@@ -15478,9 +15477,9 @@
 	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O3 -m64 @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O3 -m64 @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O3 -m64 @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage 2 in $(HOST_SUBDIR)/mpc; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
 	cd $(HOST_SUBDIR)/mpc || exit 1; \
@@ -15491,6 +15490,7 @@
 	esac; \
 	module_srcdir=mpc; \
 	$(SHELL) $$s/$$module_srcdir/configure \
+	  CFLAGS="-O3 -m64 @CPU_FLAGS@" \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} \
@@ -15512,9 +15512,9 @@
 	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O3 -m64 @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O3 -m64 @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O3 -m64 @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage 3 in $(HOST_SUBDIR)/mpc; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
 	cd $(HOST_SUBDIR)/mpc || exit 1; \
@@ -15525,6 +15525,7 @@
 	esac; \
 	module_srcdir=mpc; \
 	$(SHELL) $$s/$$module_srcdir/configure \
+	  CFLAGS="-O3 -m64 @CPU_FLAGS@" \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} \
@@ -15546,9 +15547,9 @@
 	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O3 -m64 @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O3 -m64 @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O3 -m64 @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage 4 in $(HOST_SUBDIR)/mpc; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
 	cd $(HOST_SUBDIR)/mpc || exit 1; \
@@ -15559,6 +15560,7 @@
 	esac; \
 	module_srcdir=mpc; \
 	$(SHELL) $$s/$$module_srcdir/configure \
+	  CFLAGS="-O3 -m64 @CPU_FLAGS@" \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} \
@@ -15580,9 +15582,9 @@
 	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O3 -m64 -pedantic @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O3 -m64 @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O3 -m64 @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage profile in $(HOST_SUBDIR)/mpc; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
 	cd $(HOST_SUBDIR)/mpc || exit 1; \
@@ -15593,6 +15595,7 @@
 	esac; \
 	module_srcdir=mpc; \
 	$(SHELL) $$s/$$module_srcdir/configure \
+	  CFLAGS="-O3 -m64 @CPU_FLAGS@" \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} \
@@ -15614,9 +15617,9 @@
 	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O3 -m64 @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O3 -m64 @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O3 -m64 @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage train in $(HOST_SUBDIR)/mpc; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
 	cd $(HOST_SUBDIR)/mpc || exit 1; \
@@ -15627,6 +15630,7 @@
 	esac; \
 	module_srcdir=mpc; \
 	$(SHELL) $$s/$$module_srcdir/configure \
+	  CFLAGS="-O3 -m64 @CPU_FLAGS@" \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} \
@@ -15648,9 +15652,9 @@
 	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O3 -m64 @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O3 -m64 @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O3 -m64 @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage feedback in $(HOST_SUBDIR)/mpc; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
 	cd $(HOST_SUBDIR)/mpc || exit 1; \
@@ -15661,6 +15665,7 @@
 	esac; \
 	module_srcdir=mpc; \
 	$(SHELL) $$s/$$module_srcdir/configure \
+	  CFLAGS="-O3 -m64 @CPU_FLAGS@" \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} \
@@ -15682,9 +15687,9 @@
 	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O3 -m64 @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O3 -m64 @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O3 -m64 @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage autoprofile in $(HOST_SUBDIR)/mpc; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
 	cd $(HOST_SUBDIR)/mpc || exit 1; \
@@ -15695,6 +15700,7 @@
 	esac; \
 	module_srcdir=mpc; \
 	$(SHELL) $$s/$$module_srcdir/configure \
+	  CFLAGS="-O3 -m64 @CPU_FLAGS@" \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} \
@@ -15716,9 +15722,9 @@
 	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
+	CFLAGS="-O3 -m64 @CPU_FLAGS@"; export CFLAGS; \
+	CXXFLAGS="-O3 -m64 @CPU_FLAGS@"; export CXXFLAGS; \
+	LIBCFLAGS="-O3 -m64 @CPU_FLAGS@"; export LIBCFLAGS;  \
 	echo Configuring stage autofeedback in $(HOST_SUBDIR)/mpc; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
 	cd $(HOST_SUBDIR)/mpc || exit 1; \
@@ -15729,6 +15735,7 @@
 	esac; \
 	module_srcdir=mpc; \
 	$(SHELL) $$s/$$module_srcdir/configure \
+	  CFLAGS="-O3 -m64 @CPU_FLAGS@" \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
 	  --target=${target_alias} \
@@ -15777,13 +15784,13 @@
 	cd $(HOST_SUBDIR)/mpc && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
-		LIBCFLAGS="$(LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		CXXFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
 		$(EXTRA_HOST_FLAGS)  \
 		$(STAGE1_FLAGS_TO_PASS)  \
 		TFLAGS="$(STAGE1_TFLAGS)"  \
@@ -15822,13 +15829,13 @@
 	cd $(HOST_SUBDIR)/mpc && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGE2_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		CXXFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
 		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
 		TFLAGS="$(STAGE2_TFLAGS)"  \
 		$(TARGET-stage2-mpc)
@@ -15865,13 +15872,13 @@
 	cd $(HOST_SUBDIR)/mpc && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGE3_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		CXXFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
 		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
 		TFLAGS="$(STAGE3_TFLAGS)"  \
 		$(TARGET-stage3-mpc)
@@ -15908,13 +15915,13 @@
 	cd $(HOST_SUBDIR)/mpc && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		CXXFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
 		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
 		TFLAGS="$(STAGE4_TFLAGS)"  \
 		$(TARGET-stage4-mpc)
@@ -15951,13 +15958,13 @@
 	cd $(HOST_SUBDIR)/mpc && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		CXXFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
 		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
 		TFLAGS="$(STAGEprofile_TFLAGS)"  \
 		$(TARGET-stageprofile-mpc)
@@ -15994,13 +16001,13 @@
 	cd $(HOST_SUBDIR)/mpc && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		CXXFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
 		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
 		TFLAGS="$(STAGEtrain_TFLAGS)"  \
 		$(TARGET-stagetrain-mpc)
@@ -16037,13 +16044,13 @@
 	cd $(HOST_SUBDIR)/mpc && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		CXXFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
 		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
 		TFLAGS="$(STAGEfeedback_TFLAGS)"  \
 		$(TARGET-stagefeedback-mpc)
@@ -16080,13 +16087,13 @@
 	cd $(HOST_SUBDIR)/mpc && \
 	$$s/gcc/config/i386/$(AUTO_PROFILE) \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		CXXFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
 		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
 		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
 		$(TARGET-stageautoprofile-mpc)
@@ -16123,13 +16130,13 @@
 	cd $(HOST_SUBDIR)/mpc && \
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		GENERATOR_CFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		CXXFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS="-O3 -m64 @CPU_FLAGS@" \
+		CFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
+		CXXFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
+		LIBCFLAGS_FOR_TARGET="-O3 -m64 @CPU_FLAGS@" \
 		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
 		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
 		$(TARGET-stageautofeedback-mpc)
--- gcc-releases-gcc-13.4.0/libstdc++-v3/src/c++11/Makefile.in.orig	2025-06-05 18:03:58.000000000 +0200
+++ gcc-releases-gcc-13.4.0/libstdc++-v3/src/c++11/Makefile.in	2026-06-25 19:08:29.726332000 +0200
@@ -874,19 +874,19 @@
 	$(CXXCOMPILE) -fchar8_t -c $<
 
 @ENABLE_DUAL_ABI_TRUE@cxx11-ios_failure-lt.s: cxx11-ios_failure.cc
-@ENABLE_DUAL_ABI_TRUE@	$(LTCXXCOMPILE) -gno-as-loc-support -S $< -o tmp-cxx11-ios_failure-lt.s
+@ENABLE_DUAL_ABI_TRUE@	$(LTCXXCOMPILE) -fPIC -gno-as-loc-support -S $< -o tmp-cxx11-ios_failure-lt.s
 @ENABLE_DUAL_ABI_TRUE@	-test -f tmp-cxx11-ios_failure-lt.o && mv -f tmp-cxx11-ios_failure-lt.o tmp-cxx11-ios_failure-lt.s
 @ENABLE_DUAL_ABI_TRUE@	$(rewrite_ios_failure_typeinfo) tmp-$@ > $@
 @ENABLE_DUAL_ABI_TRUE@	-rm -f tmp-$@
 @ENABLE_DUAL_ABI_TRUE@cxx11-ios_failure.s: cxx11-ios_failure.cc
-@ENABLE_DUAL_ABI_TRUE@	$(CXXCOMPILE) -gno-as-loc-support -S $< -o tmp-$@
+@ENABLE_DUAL_ABI_TRUE@	$(CXXCOMPILE) -fPIC -gno-as-loc-support -S $< -o tmp-$@
 @ENABLE_DUAL_ABI_TRUE@	$(rewrite_ios_failure_typeinfo) tmp-$@ > $@
 @ENABLE_DUAL_ABI_TRUE@	-rm -f tmp-$@
 
 @ENABLE_DUAL_ABI_TRUE@cxx11-ios_failure.lo: cxx11-ios_failure-lt.s
-@ENABLE_DUAL_ABI_TRUE@	$(LTCXXCOMPILE) -g0 -c $< -o $@
+@ENABLE_DUAL_ABI_TRUE@	$(LTCXXCOMPILE) -fPIC -g0 -c $< -o $@
 @ENABLE_DUAL_ABI_TRUE@cxx11-ios_failure.o: cxx11-ios_failure.s
-@ENABLE_DUAL_ABI_TRUE@	$(CXXCOMPILE) -g0 -c $<
+@ENABLE_DUAL_ABI_TRUE@	$(CXXCOMPILE) -fPIC -g0 -c $<
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.