summaryrefslogtreecommitdiff
path: root/libstdc++-v3/configure.host
diff options
context:
space:
mode:
authorpbrook <pbrook@138bc75d-0d04-0410-961f-82ee72b054a4>2004-07-02 23:40:19 +0000
committerpbrook <pbrook@138bc75d-0d04-0410-961f-82ee72b054a4>2004-07-02 23:40:19 +0000
commit479a838e6b07d40a7a7429a8f750c48e768a2d95 (patch)
tree4ee3482f74ebfac6d6e99562f108ef088befc592 /libstdc++-v3/configure.host
parent7644948ee83de397d8973b1bfd45baf180d60f2c (diff)
downloadgcc-479a838e6b07d40a7a7429a8f750c48e768a2d95.tar.gz
* configure.ac: Set ABI_TWEAKS_SRCDIR.
* configure.host: Set abi_tweaks_dir. Check for atomicity.h when setting atomicity_dir. Override type_cpu for arm based targets. * include/Makefile.am (host_headers): Add cxxabi_tweaks.h. * libsupc++/cxxabi.h: Include bits/cxxabi.h. Don't declare __guard. * libsupc++/guard.cc: Use definitions from cxxabi_tweaks.h. * libsupc++/vec.cc: Ditto. * config/cpu/arm/cxxabi_tweaks.h: New file. * config/cpu/generic/cxxabi_tweaks.h: New file. * */Makefile.in: Regenerate. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@84032 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/configure.host')
-rw-r--r--libstdc++-v3/configure.host17
1 files changed, 15 insertions, 2 deletions
diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
index 747cf74099a..d63e58a21a2 100644
--- a/libstdc++-v3/configure.host
+++ b/libstdc++-v3/configure.host
@@ -97,8 +97,11 @@ case "${host_cpu}" in
sparc* | ultrasparc)
try_cpu=sparc
;;
+ arm* | xscale | ep9312)
+ try_cpu=arm
+ ;;
*)
- if test -f ${glibcxx_srcdir}/config/cpu/${host_cpu}/atomicity.h; then
+ if test -d ${glibcxx_srcdir}/config/cpu/${host_cpu}; then
try_cpu=${host_cpu}
else
try_cpu=generic
@@ -121,9 +124,19 @@ esac
# default choices for those if they haven't been explicitly set
# already.
cpu_include_dir="cpu/${try_cpu}"
-atomicity_dir=$cpu_include_dir
abi_baseline_pair=${try_cpu}-${host_os}
+if test -f ${glibcxx_srcdir}/config/${cpu_include_dir}/atomicity.h ; then
+ atomicity_dir=$cpu_include_dir
+else
+ atomicity_dir="cpu/generic"
+fi
+
+if test -f ${glibcxx_srcdir}/config/${cpu_include_dir}/cxxabi_tweaks.h ; then
+ abi_tweaks_dir=$cpu_include_dir
+else
+ abi_tweaks_dir="cpu/generic"
+fi
# Set any OS-dependent bits.
# Set the os_include_dir.