-cpu_include_dir="cpu/${try_cpu}"
-atomicity_include_dir=$cpu_include_dir
-abi_baseline_pair=${try_cpu}-${host_os}
+cpu_include_dir=cpu/${try_cpu}
+
+
+# Set specific CPU overrides for cpu_defines_dir. Most can just use generic.
+# THIS TABLE IS SORTED. KEEP IT THAT WAY.
+case "${host_cpu}" in
+ powerpc* | rs6000)
+ cpu_defines_dir=cpu/powerpc
+ ;;
+esac
+
+
+# Set specific CPU overrides for atomic_word_dir and atomic_flags.
+# Most can just use generic.
+# THIS TABLE IS SORTED. KEEP IT THAT WAY.
+case "${host_cpu}" in
+ alpha*)
+ atomic_word_dir=cpu/alpha
+ ;;
+ cris*)
+ atomic_word_dir=cpu/cris
+ ;;
+ ia64)
+ atomic_word_dir=cpu/ia64
+ ;;
+ i[4567]86 | x86_64)
+ atomic_flags="-march=native"
+ ;;
+ powerpc* | rs6000)
+ atomic_word_dir=cpu/powerpc
+ ;;
+ sparc* | ultrasparc)
+ atomic_word_dir=cpu/sparc
+ atomic_flags="-mcpu=v9"
+ ;;
+esac
+
+
+# Set specific CPU overrides for atomicity_dir.
+# This can be over-ridden in GLIBCXX_ENABLE_ATOMIC_BUILTINS.
+# THIS TABLE IS SORTED. KEEP IT THAT WAY.
+if test -f ${glibcxx_srcdir}/config/${cpu_include_dir}/atomicity.h ; then
+ atomicity_dir=$cpu_include_dir
+fi
+
+
+if test -f ${glibcxx_srcdir}/config/${cpu_include_dir}/cxxabi_tweaks.h ; then
+ abi_tweaks_dir=$cpu_include_dir
+fi