From 0b971613deb9798ab70fb200a6c1f86caa8d736b Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Tue, 5 Dec 2000 14:05:34 +0000
Subject: [PATCH] *.h: Move here from config/os/bsd/bits.

* config/os/freebsd/bits/*.h: Move here from config/os/bsd/bits.
* aclocal.m4: Adjust accordingly.
* configure.target: Likewise.
* configure: Regenerate.

From-SVN: r38036
---
 libstdc++-v3/ChangeLog                                     | 7 +++++++
 libstdc++-v3/aclocal.m4                                    | 4 ++--
 libstdc++-v3/config/os/{bsd => freebsd}/bits/ctype_base.h  | 0
 .../config/os/{bsd => freebsd}/bits/ctype_inline.h         | 0
 .../config/os/{bsd => freebsd}/bits/ctype_noninline.h      | 0
 libstdc++-v3/config/os/{bsd => freebsd}/bits/os_defines.h  | 0
 libstdc++-v3/configure                                     | 4 ++--
 libstdc++-v3/configure.target                              | 7 ++++++-
 8 files changed, 17 insertions(+), 5 deletions(-)
 rename libstdc++-v3/config/os/{bsd => freebsd}/bits/ctype_base.h (100%)
 rename libstdc++-v3/config/os/{bsd => freebsd}/bits/ctype_inline.h (100%)
 rename libstdc++-v3/config/os/{bsd => freebsd}/bits/ctype_noninline.h (100%)
 rename libstdc++-v3/config/os/{bsd => freebsd}/bits/os_defines.h (100%)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 927ae79307e..a70b982b55a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-05  Richard Earnshaw  <rearnsha@arm.com>
+
+	* config/os/freebsd/bits/*.h: Move here from config/os/bsd/bits.
+	* aclocal.m4: Adjust accordingly.
+	* configure.target: Likewise.
+	* configure: Regenerate.
+
 2000-12-05  Richard Earnshaw  <rearnsha@arm.com>
 
 	* config/cpu/arm/bits/atomicity.h: Add support for compiling Thumb
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index d45d6442dbf..c2c6f762f5d 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -829,7 +829,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [
     ctype_bsd=yes, ctype_bsd=no)
     AC_MSG_RESULT($ctype_bsd)
     if test $ctype_bsd = "yes"; then
-      ctype_include_dir="config/os/bsd"
+      ctype_include_dir="config/os/freebsd"
       ctype_default=no
     fi
     fi
@@ -845,7 +845,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [
     ctype_freebsd34=yes, ctype_freebsd34=no)
     AC_MSG_RESULT($ctype_freebsd34)
     if test $ctype_freebsd34 = "yes"; then
-      ctype_include_dir="config/os/bsd"
+      ctype_include_dir="config/os/freebsd"
       ctype_default=no
     fi
     fi
diff --git a/libstdc++-v3/config/os/bsd/bits/ctype_base.h b/libstdc++-v3/config/os/freebsd/bits/ctype_base.h
similarity index 100%
rename from libstdc++-v3/config/os/bsd/bits/ctype_base.h
rename to libstdc++-v3/config/os/freebsd/bits/ctype_base.h
diff --git a/libstdc++-v3/config/os/bsd/bits/ctype_inline.h b/libstdc++-v3/config/os/freebsd/bits/ctype_inline.h
similarity index 100%
rename from libstdc++-v3/config/os/bsd/bits/ctype_inline.h
rename to libstdc++-v3/config/os/freebsd/bits/ctype_inline.h
diff --git a/libstdc++-v3/config/os/bsd/bits/ctype_noninline.h b/libstdc++-v3/config/os/freebsd/bits/ctype_noninline.h
similarity index 100%
rename from libstdc++-v3/config/os/bsd/bits/ctype_noninline.h
rename to libstdc++-v3/config/os/freebsd/bits/ctype_noninline.h
diff --git a/libstdc++-v3/config/os/bsd/bits/os_defines.h b/libstdc++-v3/config/os/freebsd/bits/os_defines.h
similarity index 100%
rename from libstdc++-v3/config/os/bsd/bits/os_defines.h
rename to libstdc++-v3/config/os/freebsd/bits/os_defines.h
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 0f5aa143c5e..77c6967d04d 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -17844,7 +17844,7 @@ fi
 rm -f conftest*
     echo "$ac_t""$ctype_bsd" 1>&6
     if test $ctype_bsd = "yes"; then
-      ctype_include_dir="config/os/bsd"
+      ctype_include_dir="config/os/freebsd"
       ctype_default=no
     fi
     fi
@@ -17876,7 +17876,7 @@ fi
 rm -f conftest*
     echo "$ac_t""$ctype_freebsd34" 1>&6
     if test $ctype_freebsd34 = "yes"; then
-      ctype_include_dir="config/os/bsd"
+      ctype_include_dir="config/os/freebsd"
       ctype_default=no
     fi
     fi
diff --git a/libstdc++-v3/configure.target b/libstdc++-v3/configure.target
index 77db99e80a2..0b70d40803c 100644
--- a/libstdc++-v3/configure.target
+++ b/libstdc++-v3/configure.target
@@ -82,7 +82,7 @@ case "${target_os}" in
     os_include_dir="config/os/aix"
     ;;
   bsd* | freebsd* )
-    os_include_dir="config/os/bsd"
+    os_include_dir="config/os/freebsd"
     ;;
   cygwin*)
     os_include_dir="config/os/newlib"
@@ -115,6 +115,11 @@ esac
 # THIS TABLE IS SORTED.  KEEP IT THAT WAY.
 
 case "${target}" in
+   arm*-*-aout | arm*-*-elf)
+     # Assume newlib
+     os_include_dir=config/os/newlib
+     ATOMICITYH=$cpu_include_dir
+     ;;
    *-*-aix*)
      ATOMICITYH=$os_include_dir
      ;;