* config/os/freebsd/bits/*.h: Move here from config/os/bsd/bits.

* aclocal.m4: Adjust accordingly.
* configure.target: Likewise.
* configure: Regenerate.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38036 138bc75d-0d04-0410-961f-82ee72b054a4

8 files changed, 17 insertions, 5 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 927ae79307e..a70b982b55a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,12 @@
 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
 	code.
 
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
index 145321f5fee..145321f5fee 100644
--- a/libstdc++-v3/config/os/bsd/bits/ctype_base.h
+++ b/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
index 92ffe703fd6..92ffe703fd6 100644
--- a/libstdc++-v3/config/os/bsd/bits/ctype_inline.h
+++ b/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
index 24fdcdb23ea..24fdcdb23ea 100644
--- a/libstdc++-v3/config/os/bsd/bits/ctype_noninline.h
+++ b/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
index 1cb71d149ec..1cb71d149ec 100644
--- a/libstdc++-v3/config/os/bsd/bits/os_defines.h
+++ b/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
      ;;