Makefile.am (AC_CXXFLAGS): Add CPUFLAGS here.

2000-05-01  Benjamin Kosnik  <bkoz@haight.constant.com>

	* src/Makefile.am (AC_CXXFLAGS): Add CPUFLAGS here.
	* src/Makefile.in: Regenerate.
	* acinclude.m4 (GLIBCPP_ENABLE_DEBUG): Revert.

From-SVN: r33593

10 files changed, 141 insertions, 136 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cc093dd..61a0e79 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-01  Benjamin Kosnik  <bkoz@haight.constant.com>
+
+	* src/Makefile.am (AC_CXXFLAGS): Add CPUFLAGS here.
+	* src/Makefile.in: Regenerate.
+	* acinclude.m4 (GLIBCPP_ENABLE_DEBUG): Revert.
+
 2000-04-30  Benjamin Kosnik  <bkoz@gnu.org>
 
 	* config/cpu/powerpc/bits/atomicity.h (__compare_and_swap): Fix typo.
diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index 9c2822b..59af557 100644
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -68,6 +68,7 @@ AS = @AS@
 BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@
 CC = @CC@
 CPP = @CPP@
+CPUFLAGS = @CPUFLAGS@
 CSTDIO_CC = @CSTDIO_CC@
 CSTDIO_H = @CSTDIO_H@
 CXX = @CXX@
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index f064730..af4df89 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -238,9 +238,11 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [
 
 
 dnl
+
 dnl Check to see what architecture we are compiling for. If it's
 dnl supported, use special hand-crafted routines to provide thread
-dnl primitives.
+dnl primitives. Also, if architecture-specific flags are required for 
+dnl compilation, add them here.
 dnl 
 dnl Depending on what is found, select configure/cpu/*/bits/atomicity.h 
 dnl If not found, select configure/cpu/generic/bits/atomicity.h
@@ -248,6 +250,7 @@ dnl
 dnl GLIBCPP_CHECK_CPU
 AC_DEFUN(GLIBCPP_CHECK_CPU, [
     AC_MSG_CHECKING([for cpu primitives directory])
+    CPUFLAGS=			
     case "$target_cpu" in
       alpha*)
 	cpu_include_dir="config/cpu/alpha"
@@ -260,6 +263,7 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [
         ;;
       powerpc | rs6000)
 	cpu_include_dir="config/cpu/powerpc"
+    	CPUFLAGS='-mnew-mnemonics -Wa,-mppc -mpowerpc'
         ;;
       sparc64 | ultrasparc)
 	cpu_include_dir="config/cpu/sparc/sparc64"
@@ -273,6 +277,7 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [
     esac
     AC_MSG_RESULT($cpu_include_dir)
     AC_SUBST(cpu_include_dir)
+    AC_SUBST(CPUFLAGS)
 ])
 
  
@@ -604,16 +609,9 @@ changequote([, ])dnl
 enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl
 dnl Option parsed, now set things appropriately
 case "$enable_debug" in
-    yes)  
-        case "$target_cpu" in
-		alpha*)
-			DEBUGFLAGS='-O0 -gdwarf-2'
-			;;			
-		*)
-			DEBUGFLAGS='-O0 -g'			
-			;;
-	esac
-        ;;
+    yes) 
+	DEBUGFLAGS='-O0 -ggdb'			
+	;;
     no)   
 	DEBUGFLAGS='-g'
         ;;
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index 1b5e847..ef693aa 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -250,9 +250,11 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [
 
 
 dnl
+
 dnl Check to see what architecture we are compiling for. If it's
 dnl supported, use special hand-crafted routines to provide thread
-dnl primitives.
+dnl primitives. Also, if architecture-specific flags are required for 
+dnl compilation, add them here.
 dnl 
 dnl Depending on what is found, select configure/cpu/*/bits/atomicity.h 
 dnl If not found, select configure/cpu/generic/bits/atomicity.h
@@ -260,6 +262,7 @@ dnl
 dnl GLIBCPP_CHECK_CPU
 AC_DEFUN(GLIBCPP_CHECK_CPU, [
     AC_MSG_CHECKING([for cpu primitives directory])
+    CPUFLAGS=			
     case "$target_cpu" in
       alpha*)
 	cpu_include_dir="config/cpu/alpha"
@@ -272,6 +275,7 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [
         ;;
       powerpc | rs6000)
 	cpu_include_dir="config/cpu/powerpc"
+    	CPUFLAGS='-mnew-mnemonics -Wa,-mppc -mpowerpc'
         ;;
       sparc64 | ultrasparc)
 	cpu_include_dir="config/cpu/sparc/sparc64"
@@ -285,6 +289,7 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [
     esac
     AC_MSG_RESULT($cpu_include_dir)
     AC_SUBST(cpu_include_dir)
+    AC_SUBST(CPUFLAGS)
 ])
 
  
@@ -616,16 +621,9 @@ changequote([, ])dnl
 enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl
 dnl Option parsed, now set things appropriately
 case "$enable_debug" in
-    yes)  
-        case "$target_cpu" in
-		alpha*)
-			DEBUGFLAGS='-O0 -gdwarf-2'
-			;;			
-		*)
-			DEBUGFLAGS='-O0 -g'			
-			;;
-	esac
-        ;;
+    yes) 
+	DEBUGFLAGS='-O0 -ggdb'			
+	;;
     no)   
 	DEBUGFLAGS='-g'
         ;;
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 73d8d89..6c43883 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -2128,6 +2128,7 @@ rm -f conftest*
 
     echo $ac_n "checking for cpu primitives directory""... $ac_c" 1>&6
 echo "configure:2131: checking for cpu primitives directory" >&5
+    CPUFLAGS=			
     case "$target_cpu" in
       alpha*)
 	cpu_include_dir="config/cpu/alpha"
@@ -2140,6 +2141,7 @@ echo "configure:2131: checking for cpu primitives directory" >&5
         ;;
       powerpc | rs6000)
 	cpu_include_dir="config/cpu/powerpc"
+    	CPUFLAGS='-mnew-mnemonics -Wa,-mppc -mpowerpc'
         ;;
       sparc64 | ultrasparc)
 	cpu_include_dir="config/cpu/sparc/sparc64"
@@ -2153,6 +2155,7 @@ echo "configure:2131: checking for cpu primitives directory" >&5
     esac
     echo "$ac_t""$cpu_include_dir" 1>&6
     
+    
 
 
 # Enable all the crazy c++ stuff.
@@ -2168,16 +2171,9 @@ else
   enable_debug=no
 fi
 case "$enable_debug" in
-    yes)  
-        case "$target_cpu" in
-		alpha*)
-			DEBUGFLAGS='-O0 -gdwarf-2'
-			;;			
-		*)
-			DEBUGFLAGS='-O0 -g'			
-			;;
-	esac
-        ;;
+    yes) 
+	DEBUGFLAGS='-O0 -ggdb'			
+	;;
     no)   
 	DEBUGFLAGS='-g'
         ;;
@@ -2186,7 +2182,7 @@ esac
 
 
   echo $ac_n "checking for cstdio to use""... $ac_c" 1>&6
-echo "configure:2190: checking for cstdio to use" >&5
+echo "configure:2186: checking for cstdio to use" >&5
   # Check whether --enable-cstdio or --disable-cstdio was given.
 if test "${enable_cstdio+set}" = set; then
   enableval="$enable_cstdio"
@@ -2210,17 +2206,17 @@ fi
 		# see if we are on a system with libio native (ie, linux)
   		ac_safe=`echo "libio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libio.h""... $ac_c" 1>&6
-echo "configure:2214: checking for libio.h" >&5
+echo "configure:2210: checking for libio.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2219 "configure"
+#line 2215 "configure"
 #include "confdefs.h"
 #include <libio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2255,17 +2251,17 @@ fi
 		# NB: This replaces the _G_CONFIG_H machinery in libio-v2
 		ac_safe=`echo "_G_config.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for _G_config.h""... $ac_c" 1>&6
-echo "configure:2259: checking for _G_config.h" >&5
+echo "configure:2255: checking for _G_config.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2264 "configure"
+#line 2260 "configure"
 #include "confdefs.h"
 #include <_G_config.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2344,7 +2340,7 @@ EOF
 
 
       echo $ac_n "checking for threads package to use""... $ac_c" 1>&6
-echo "configure:2348: checking for threads package to use" >&5
+echo "configure:2344: checking for threads package to use" >&5
   # Check whether --enable-threads or --disable-threads was given.
 if test "${enable_threads+set}" = set; then
   enableval="$enable_threads"
@@ -2407,17 +2403,17 @@ fi
     posix)
       ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for pthread.h""... $ac_c" 1>&6
-echo "configure:2411: checking for pthread.h" >&5
+echo "configure:2407: checking for pthread.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2416 "configure"
+#line 2412 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2456,6 +2452,7 @@ fi
 #GLIBCPP_ENABLE_NAMESPACES(yes)
 #GLIBCPP_ENABLE_RELIBGCC([../..])
 
+
 if test -n "$with_cross_host"; then
 
   # We are being configured with a cross compiler.  AC_REPLACE_FUNCS
@@ -2581,17 +2578,17 @@ else
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2585: checking for $ac_hdr" >&5
+echo "configure:2582: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2590 "configure"
+#line 2587 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2621,7 +2618,7 @@ done
   
   
   echo $ac_n "checking for GNU C++ __complex__ support""... $ac_c" 1>&6
-echo "configure:2625: checking for GNU C++ __complex__ support" >&5
+echo "configure:2622: checking for GNU C++ __complex__ support" >&5
   if eval "test \"`echo '$''{'glibcpp_cv_complex'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2635,7 +2632,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
     cat > conftest.$ac_ext <<EOF
-#line 2639 "configure"
+#line 2636 "configure"
 #include "confdefs.h"
 struct dcomplex { __complex__ double x; }; \
 		    dcomplex f(const dcomplex& x) { return dcomplex(x); }
@@ -2644,7 +2641,7 @@ int main() {
 		     dcomplex x; f(x); 
 ; return 0; }
 EOF
-if { (eval echo configure:2648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_complex=ok
 else
@@ -2676,7 +2673,7 @@ EOF
   
   
   echo $ac_n "checking for GNU C++ __complex__ float support""... $ac_c" 1>&6
-echo "configure:2680: checking for GNU C++ __complex__ float support" >&5
+echo "configure:2677: checking for GNU C++ __complex__ float support" >&5
   if eval "test \"`echo '$''{'glibcpp_cv_float_complex'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2709,14 +2706,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
       };
 EOB
     cat > conftest.$ac_ext <<EOF
-#line 2713 "configure"
+#line 2710 "configure"
 #include "confdefs.h"
 #include "conftest.h"
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_float_complex=ok
 else
@@ -2747,16 +2744,16 @@ EOF
 
   
     echo $ac_n "checking for __builtin_sinf""... $ac_c" 1>&6
-echo "configure:2751: checking for __builtin_sinf" >&5
+echo "configure:2748: checking for __builtin_sinf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 2753 "configure"
+#line 2750 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
 float foo(void) { __builtin_sinf(0.0); }
 ; return 0; }
 EOF
-if { (eval echo configure:2760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sinf=yes
 else
@@ -2775,16 +2772,16 @@ EOF
   fi
 
   echo $ac_n "checking for __builtin_cosf""... $ac_c" 1>&6
-echo "configure:2779: checking for __builtin_cosf" >&5
+echo "configure:2776: checking for __builtin_cosf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 2781 "configure"
+#line 2778 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
 float foo(void) { __builtin_cosf(0.0); }
 ; return 0; }
 EOF
-if { (eval echo configure:2788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_cosf=yes
 else
@@ -2803,16 +2800,16 @@ EOF
   fi
 
   echo $ac_n "checking for __builtin_fabsf""... $ac_c" 1>&6
-echo "configure:2807: checking for __builtin_fabsf" >&5
+echo "configure:2804: checking for __builtin_fabsf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 2809 "configure"
+#line 2806 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
 float foo(void) { __builtin_fabsf(0.0); }
 ; return 0; }
 EOF
-if { (eval echo configure:2816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_fabsf=yes
 else
@@ -2831,16 +2828,16 @@ EOF
   fi
 
   echo $ac_n "checking for __builtin_sqrtf""... $ac_c" 1>&6
-echo "configure:2835: checking for __builtin_sqrtf" >&5
+echo "configure:2832: checking for __builtin_sqrtf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 2837 "configure"
+#line 2834 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
 float foo(void) { __builtin_sqrtf(0.0); }
 ; return 0; }
 EOF
-if { (eval echo configure:2844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sqrtf=yes
 else
@@ -2860,7 +2857,7 @@ EOF
 
   
   echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:2864: checking for sin in -lm" >&5
+echo "configure:2861: checking for sin in -lm" >&5
 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2868,7 +2865,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2872 "configure"
+#line 2869 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2879,7 +2876,7 @@ int main() {
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:2883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2906,17 +2903,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2910: checking for $ac_hdr" >&5
+echo "configure:2907: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2915 "configure"
+#line 2912 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2948,12 +2945,12 @@ done
   carg cargf nan hypot hypotf atan2f expf copysignf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2952: checking for $ac_func" >&5
+echo "configure:2949: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2957 "configure"
+#line 2954 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2976,7 +2973,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3005,12 +3002,12 @@ done
 
       USE_LONG_DOUBLE=no
   echo $ac_n "checking for copysignl""... $ac_c" 1>&6
-echo "configure:3009: checking for copysignl" >&5
+echo "configure:3006: checking for copysignl" >&5
 if eval "test \"`echo '$''{'ac_cv_func_copysignl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3014 "configure"
+#line 3011 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char copysignl(); below.  */
@@ -3033,7 +3030,7 @@ copysignl();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_copysignl=yes"
 else
@@ -3052,12 +3049,12 @@ if eval "test \"`echo '$ac_cv_func_'copysignl`\" = yes"; then
   csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3056: checking for $ac_func" >&5
+echo "configure:3053: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3061 "configure"
+#line 3058 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3080,7 +3077,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3118,12 +3115,12 @@ fi
   fpclass qfpclass
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3122: checking for $ac_func" >&5
+echo "configure:3119: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3127 "configure"
+#line 3124 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3146,7 +3143,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3181,12 +3178,12 @@ _strtof _strtold _fabsf _sincos _sincosf _sincosl _finite _finitef _qfinite \
 _fpclass _qfpclass
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3185: checking for $ac_func" >&5
+echo "configure:3182: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3190 "configure"
+#line 3187 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3209,7 +3206,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3239,17 +3236,17 @@ LIBS="$save_LIBS"
   
   ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wchar.h""... $ac_c" 1>&6
-echo "configure:3243: checking for wchar.h" >&5
+echo "configure:3240: checking for wchar.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3248 "configure"
+#line 3245 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3267,16 +3264,16 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
     echo $ac_n "checking for native mbstate_t""... $ac_c" 1>&6
-echo "configure:3271: checking for native mbstate_t" >&5
+echo "configure:3268: checking for native mbstate_t" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3273 "configure"
+#line 3270 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 int main() {
 mbstate_t teststate;
 ; return 0; }
 EOF
-if { (eval echo configure:3280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_native_mbstatet=yes
 else
@@ -3295,16 +3292,16 @@ EOF
   fi
   
       echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6
-echo "configure:3299: checking for WCHAR_MIN and WCHAR_MAX" >&5
+echo "configure:3296: checking for WCHAR_MIN and WCHAR_MAX" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3301 "configure"
+#line 3298 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 int main() {
 int i = WCHAR_MIN; int j = WCHAR_MAX;
 ; return 0; }
 EOF
-if { (eval echo configure:3308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   has_wchar_minmax=yes
 else
@@ -3325,9 +3322,9 @@ EOF
   # Test wchar.h for WEOF, which is what we use to determine whether
   # to specialize for wchar_t or not.
   echo $ac_n "checking for WEOF""... $ac_c" 1>&6
-echo "configure:3329: checking for WEOF" >&5
+echo "configure:3326: checking for WEOF" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3331 "configure"
+#line 3328 "configure"
 #include "confdefs.h"
 
     #include <wchar.h>
@@ -3336,7 +3333,7 @@ int main() {
 wint_t i = WEOF;
 ; return 0; }
 EOF
-if { (eval echo configure:3340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   has_weof=yes
 else
@@ -3351,12 +3348,12 @@ rm -f conftest*
     for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3355: checking for $ac_func" >&5
+echo "configure:3352: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3360 "configure"
+#line 3357 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3379,7 +3376,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3408,7 +3405,7 @@ done
   
 
   echo $ac_n "checking for wide character support""... $ac_c" 1>&6
-echo "configure:3412: checking for wide character support" >&5
+echo "configure:3409: checking for wide character support" >&5
   if test $has_weof = "yes" && test $has_wchar_minmax = "yes"; then
     libinst_wstring_la="libinst-wstring.la"
     cat >> confdefs.h <<\EOF
@@ -3436,17 +3433,17 @@ fi
   
   ac_safe=`echo "ctype.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ctype.h""... $ac_c" 1>&6
-echo "configure:3440: checking for ctype.h" >&5
+echo "configure:3437: checking for ctype.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3445 "configure"
+#line 3442 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3467,9 +3464,9 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
         ctype_default=yes
 
         echo $ac_n "checking for gnu-linux <ctype>""... $ac_c" 1>&6
-echo "configure:3471: checking for gnu-linux <ctype>" >&5
+echo "configure:3468: checking for gnu-linux <ctype>" >&5
     cat > conftest.$ac_ext <<EOF
-#line 3473 "configure"
+#line 3470 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -3480,7 +3477,7 @@ int
 	+ __ctype_tolower[a] + __ctype_toupper[a] + __ctype_b[a];}
 ; return 0; }
 EOF
-if { (eval echo configure:3484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_linux=yes
@@ -3499,9 +3496,9 @@ rm -f conftest*
 
         if test $ctype_default = "yes"; then
     echo $ac_n "checking for solaris 2.6 or 2.7 <ctype>""... $ac_c" 1>&6
-echo "configure:3503: checking for solaris 2.6 or 2.7 <ctype>" >&5
+echo "configure:3500: checking for solaris 2.6 or 2.7 <ctype>" >&5
     cat > conftest.$ac_ext <<EOF
-#line 3505 "configure"
+#line 3502 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -3512,7 +3509,7 @@ int
 	+ __trans_lower[a] + __trans_upper[a] + __ctype_mask[a];}
 ; return 0; }
 EOF
-if { (eval echo configure:3516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_solaris=yes
@@ -3527,7 +3524,7 @@ rm -f conftest*
 
     if test $ctype_solaris = "yes"; then
       echo $ac_n "checking   for version""... $ac_c" 1>&6
-echo "configure:3531: checking   for version" >&5
+echo "configure:3528: checking   for version" >&5
       ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -3536,14 +3533,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
  
       cat > conftest.$ac_ext <<EOF
-#line 3540 "configure"
+#line 3537 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
 typedef long* __to_type; __to_type const& _M_toupper = __trans_upper;
 ; return 0; }
 EOF
-if { (eval echo configure:3547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
       ctype_solaris26=yes
@@ -3575,9 +3572,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 
         if test $ctype_default = "yes"; then
     echo $ac_n "checking for solaris 2.5.1 <ctype>""... $ac_c" 1>&6
-echo "configure:3579: checking for solaris 2.5.1 <ctype>" >&5
+echo "configure:3576: checking for solaris 2.5.1 <ctype>" >&5
     cat > conftest.$ac_ext <<EOF
-#line 3581 "configure"
+#line 3578 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -3587,7 +3584,7 @@ int
 	+ __ctype[a];}
 ; return 0; }
 EOF
-if { (eval echo configure:3591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_solaris25=yes
@@ -3607,9 +3604,9 @@ rm -f conftest*
 
         if test $ctype_default = "yes"; then
     echo $ac_n "checking for aix <ctype>""... $ac_c" 1>&6
-echo "configure:3611: checking for aix <ctype>" >&5
+echo "configure:3608: checking for aix <ctype>" >&5
     cat > conftest.$ac_ext <<EOF
-#line 3613 "configure"
+#line 3610 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -3620,7 +3617,7 @@ int
 	+ _VALC('a') + _IS('c', 0);}
 ; return 0; }
 EOF
-if { (eval echo configure:3624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_aix=yes
@@ -3640,9 +3637,9 @@ rm -f conftest*
 
         if test $ctype_default = "yes"; then
     echo $ac_n "checking for newlib <ctype>""... $ac_c" 1>&6
-echo "configure:3644: checking for newlib <ctype>" >&5
+echo "configure:3641: checking for newlib <ctype>" >&5
     cat > conftest.$ac_ext <<EOF
-#line 3646 "configure"
+#line 3643 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -3652,7 +3649,7 @@ int
 	+ _ctype_[a];}
 ; return 0; }
 EOF
-if { (eval echo configure:3656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_newlib=yes
@@ -3686,17 +3683,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3690: checking for $ac_hdr" >&5
+echo "configure:3687: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3695 "configure"
+#line 3692 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3725,12 +3722,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3729: checking for $ac_func" >&5
+echo "configure:3726: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3734 "configure"
+#line 3731 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3753,7 +3750,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3778,7 +3775,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:3782: checking for working mmap" >&5
+echo "configure:3779: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3786,7 +3783,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 3790 "configure"
+#line 3787 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -3926,7 +3923,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:3930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -3989,19 +3986,19 @@ fi
 
 if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:3993: checking for LC_MESSAGES" >&5
+echo "configure:3990: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'ac_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3998 "configure"
+#line 3995 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:4005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_val_LC_MESSAGES=yes
 else
@@ -4230,6 +4227,7 @@ s%@CPP@%$CPP%g
 s%@OPTLEVEL@%$OPTLEVEL%g
 s%@WERRORSUPPRESS@%$WERRORSUPPRESS%g
 s%@cpu_include_dir@%$cpu_include_dir%g
+s%@CPUFLAGS@%$CPUFLAGS%g
 s%@DEBUGFLAGS@%$DEBUGFLAGS%g
 s%@BUILD_LIBIO_INCLUDE@%$BUILD_LIBIO_INCLUDE%g
 s%@GLIBCPP_NEED_LIBIO_CONFIG_H_TRUE@%$GLIBCPP_NEED_LIBIO_CONFIG_H_TRUE%g
diff --git a/libstdc++-v3/configure.in b/libstdc++-v3/configure.in
index cd26c7d..43b0128 100644
--- a/libstdc++-v3/configure.in
+++ b/libstdc++-v3/configure.in
@@ -32,6 +32,7 @@ GLIBCPP_ENABLE_THREADS
 #GLIBCPP_ENABLE_NAMESPACES(yes)
 #GLIBCPP_ENABLE_RELIBGCC([../..])
 
+
 if test -n "$with_cross_host"; then
 
   # We are being configured with a cross compiler.  AC_REPLACE_FUNCS
diff --git a/libstdc++-v3/libio/Makefile.in b/libstdc++-v3/libio/Makefile.in
index 7f20873..8a088f0 100644
--- a/libstdc++-v3/libio/Makefile.in
+++ b/libstdc++-v3/libio/Makefile.in
@@ -68,6 +68,7 @@ AS = @AS@
 BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@
 CC = @CC@
 CPP = @CPP@
+CPUFLAGS = @CPUFLAGS@
 CSTDIO_CC = @CSTDIO_CC@
 CSTDIO_H = @CSTDIO_H@
 CXX = @CXX@
diff --git a/libstdc++-v3/math/Makefile.in b/libstdc++-v3/math/Makefile.in
index 0d9ef7f..de65d30 100644
--- a/libstdc++-v3/math/Makefile.in
+++ b/libstdc++-v3/math/Makefile.in
@@ -68,6 +68,7 @@ AS = @AS@
 BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@
 CC = @CC@
 CPP = @CPP@
+CPUFLAGS = @CPUFLAGS@
 CSTDIO_CC = @CSTDIO_CC@
 CSTDIO_H = @CSTDIO_H@
 CXX = @CXX@
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index f847904..2f84ff7 100644
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -42,7 +42,7 @@ WERROR = -Werror
 #                      -fdata-sections -ffunction-sections \
 #		       -fvtable-gc -Wl,--gc-sections
 # AC_CXXFLAGS = @OPTLEVEL@ @DEBUGFLAGS@ @NAMESPACES@
-AC_CXXFLAGS = @DEBUGFLAGS@ 
+AC_CXXFLAGS = @CPUFLAGS@ @DEBUGFLAGS@ 
 AM_CXXFLAGS = -fno-implicit-templates \
 	      -Wall -Wno-format -W -Wwrite-strings -Winline $(WERROR) \
 	      $(OPTIMIZE_CXXFLAGS) $(AC_CXXFLAGS) 
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index c93bc79..439ad2d 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -67,6 +67,7 @@ AS = @AS@
 BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@
 CC = @CC@
 CPP = @CPP@
+CPUFLAGS = @CPUFLAGS@
 CSTDIO_CC = @CSTDIO_CC@
 CSTDIO_H = @CSTDIO_H@
 CXX = @CXX@
@@ -118,7 +119,7 @@ WERROR = -Werror
 #                      -fdata-sections -ffunction-sections \
 #		       -fvtable-gc -Wl,--gc-sections
 # AC_CXXFLAGS = @OPTLEVEL@ @DEBUGFLAGS@ @NAMESPACES@
-AC_CXXFLAGS = @DEBUGFLAGS@ 
+AC_CXXFLAGS = @CPUFLAGS@ @DEBUGFLAGS@ 
 AM_CXXFLAGS = -fno-implicit-templates \
 	      -Wall -Wno-format -W -Wwrite-strings -Winline $(WERROR) \
 	      $(OPTIMIZE_CXXFLAGS) $(AC_CXXFLAGS)