This is the mail archive of the
libstdc++@sources.redhat.com
mailing list for the libstdc++ project.
Libstdc++-v3 Support for netbsd
- To: libstdc++ at sources dot redhat dot com, gcc-patches at gcc dot gnu dot org
- Subject: Libstdc++-v3 Support for netbsd
- From: Richard Earnshaw <rearnsha at arm dot com>
- Date: Sun, 03 Dec 2000 15:51:09 +0000
- cc: rearnsha at arm dot com
- Organization: ARM Ltd.
- Reply-To: rearnsha at arm dot com
I'm not sure if standard gcc maintainer rights extend to libstdc++-v3.
Anyway, here's the code for supporting NetBSD. I've left out the diffs
for configure below, since they are mechanical.
With the setup below, libstdc++ now builds on arm-netbsd. I still get
quite a few failures in the test suite, but I think this is due to
exception throwing not working on properly on the ARM.
<date> Richard Earnshaw <rearnsha@arm.com>
Support for NetBSD.
* aclocal.m4: Add test for NetBSD's ctype support.
* configure: Regenerate.
* configure.target: Support NetBSD.
* config/os/netbsd/bits/ctype_base.h: New file.
* config/os/netbsd/bits/ctype_inline.h: New file.
* config/os/netbsd/bits/ctype_noinline.h: New file.
* config/os/netbsd/bits/os_defines.h: New file.
Index: aclocal.m4
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/aclocal.m4,v
retrieving revision 1.101
diff -p -r1.101 aclocal.m4
*** aclocal.m4 2000/11/27 06:04:15 1.101
--- aclocal.m4 2000/12/03 15:30:54
*************** AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [
*** 850,855 ****
--- 850,871 ----
fi
fi
+ dnl Test for <ctype> functionality -- NetBSD
+ if test $ctype_default = "yes"; then
+ AC_MSG_CHECKING([<ctype> for FreeBSD 3.4])
+ AC_TRY_COMPILE([#include <ctype.h>],
+ [int
+ foo (int a)
+ { return _S + _C + _U + _L \
+ + _N + _P + _X + _tolower_tab_[a] + _toupper_tab_[a];}], \
+ ctype_netbsd=yes, ctype_netbsd=no)
+ AC_MSG_RESULT($ctype_netbsd)
+ if test $ctype_netbsd = "yes"; then
+ ctype_include_dir="config/os/netbsd"
+ ctype_default=no
+ fi
+ fi
+
dnl Test for <ctype> functionality -- Solaris 2.6 and up
if test $ctype_default = "yes"; then
AC_MSG_CHECKING([<ctype> for Solaris 2.6,7,8])
Index: configure.target
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/configure.target,v
retrieving revision 1.3
diff -p -r1.3 configure.target
*** configure.target 2000/11/27 06:04:16 1.3
--- configure.target 2000/12/03 15:30:58
*************** case "${target_os}" in
*** 93,98 ****
--- 93,101 ----
irix*)
os_include_dir="config/os/irix"
;;
+ netbsd*)
+ os_include_dir="config/os/netbsd"
+ ;;
solaris2.5*)
os_include_dir="config/os/solaris/solaris2.5"
;;
*************** case "${target}" in
*** 122,127 ****
--- 130,138 ----
ATOMICITYH=$os_include_dir
;;
*-*-linux*)
+ ATOMICITYH=$cpu_include_dir
+ ;;
+ *-*-netbsd*)
ATOMICITYH=$cpu_include_dir
;;
sparc*-*-*)
diff -Npr /tmp/empty/ctype_base.h config/os/netbsd/bits/ctype_base.h
*** /tmp/empty/ctype_base.h Thu Jan 1 01:00:00 1970
--- config/os/netbsd/bits/ctype_base.h Wed Nov 22 16:23:44 2000
***************
*** 0 ****
--- 1,63 ----
+ // Locale support -*- C++ -*-
+
+ // Copyright (C) 2000 Free Software Foundation, Inc.
+ //
+ // This file is part of the GNU ISO C++ Library. This library is free
+ // software; you can redistribute it and/or modify it under the
+ // terms of the GNU General Public License as published by the
+ // Free Software Foundation; either version 2, or (at your option)
+ // any later version.
+
+ // This library is distributed in the hope that it will be useful,
+ // but WITHOUT ANY WARRANTY; without even the implied warranty of
+ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ // GNU General Public License for more details.
+
+ // You should have received a copy of the GNU General Public License along
+ // with this library; see the file COPYING. If not, write to the Free
+ // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ // USA.
+
+ // As a special exception, you may use this file as part of a free software
+ // library without restriction. Specifically, if other files instantiate
+ // templates or use macros or inline functions from this file, or you compile
+ // this file and link it with other files to produce an executable, this
+ // file does not by itself cause the resulting executable to be covered by
+ // the GNU General Public License. This exception does not however
+ // invalidate any other reasons why the executable file might be covered by
+ // the GNU General Public License.
+
+ //
+ // ISO C++ 14882: 22.1 Locales
+ //
+
+ // Information as gleaned from /usr/include/ctype.h on FreeBSD 3.4,
+ // 4.0 and all versions of the CVS managed file at:
+ // :pserver:anoncvs@anoncvs.freebsd.org:/home/ncvs/src/include/ctype.h
+ // which should cover most classic BSD configurations
+
+ struct ctype_base
+ {
+ typedef unsigned char mask;
+ // Non-standard typedefs.
+ typedef const unsigned char* __to_type;
+
+ enum
+ {
+ // NetBSD
+ space = _S,
+ print = _P | _U | _L | _N | _B,
+ cntrl = _C,
+ upper = _U,
+ lower = _L,
+ alpha = _U | _L,
+ digit = _N,
+ punct = _P,
+ xdigit = _N | _X,
+ alnum = _U | _L | _N,
+ graph = _P | _U | _L | _N,
+ };
+ };
+
+
+
diff -Npr /tmp/empty/ctype_inline.h config/os/netbsd/bits/ctype_inline.h
*** /tmp/empty/ctype_inline.h Thu Jan 1 01:00:00 1970
--- config/os/netbsd/bits/ctype_inline.h Wed Nov 22 16:34:05 2000
***************
*** 0 ****
--- 1,72 ----
+ // Locale support -*- C++ -*-
+
+ // Copyright (C) 2000 Free Software Foundation, Inc.
+ //
+ // This file is part of the GNU ISO C++ Library. This library is free
+ // software; you can redistribute it and/or modify it under the
+ // terms of the GNU General Public License as published by the
+ // Free Software Foundation; either version 2, or (at your option)
+ // any later version.
+
+ // This library is distributed in the hope that it will be useful,
+ // but WITHOUT ANY WARRANTY; without even the implied warranty of
+ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ // GNU General Public License for more details.
+
+ // You should have received a copy of the GNU General Public License along
+ // with this library; see the file COPYING. If not, write to the Free
+ // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ // USA.
+
+ // As a special exception, you may use this file as part of a free software
+ // library without restriction. Specifically, if other files instantiate
+ // templates or use macros or inline functions from this file, or you compile
+ // this file and link it with other files to produce an executable, this
+ // file does not by itself cause the resulting executable to be covered by
+ // the GNU General Public License. This exception does not however
+ // invalidate any other reasons why the executable file might be covered by
+ // the GNU General Public License.
+
+ //
+ // ISO C++ 14882: 22.1 Locales
+ //
+
+ // ctype bits to be inlined go here. Non-inlinable (ie virtual do_*)
+ // functions go in ctype.cc
+
+ bool
+ ctype<char>::
+ is(mask __m, char __c) const throw()
+ { return _M_table[(unsigned char)(__c)] & __m; }
+
+ const char*
+ ctype<char>::
+ is(const char* __low, const char* __high, mask* __vec) const throw()
+ {
+ while (__low < __high)
+ *__vec++ = _M_table[(unsigned char)(*__low++)];
+ return __high;
+ }
+
+ const char*
+ ctype<char>::
+ scan_is(mask __m, const char* __low, const char* __high) const throw()
+ {
+ while (__low < __high && !this->is(__m, *__low))
+ ++__low;
+ return __low;
+ }
+
+ const char*
+ ctype<char>::
+ scan_not(mask __m, const char* __low, const char* __high) const throw()
+ {
+ while (__low < __high && this->is(__m, *__low) != 0)
+ ++__low;
+ return __low;
+ }
+
+
+
+
+
diff -Npr /tmp/empty/ctype_noninline.h config/os/netbsd/bits/ctype_noninline.h
*** /tmp/empty/ctype_noninline.h Thu Jan 1 01:00:00 1970
--- config/os/netbsd/bits/ctype_noninline.h Wed Nov 22 16:32:35 2000
***************
*** 0 ****
--- 1,71 ----
+ // Locale support -*- C++ -*-
+
+ // Copyright (C) 2000 Free Software Foundation, Inc.
+ //
+ // This file is part of the GNU ISO C++ Library. This library is free
+ // software; you can redistribute it and/or modify it under the
+ // terms of the GNU General Public License as published by the
+ // Free Software Foundation; either version 2, or (at your option)
+ // any later version.
+
+ // This library is distributed in the hope that it will be useful,
+ // but WITHOUT ANY WARRANTY; without even the implied warranty of
+ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ // GNU General Public License for more details.
+
+ // You should have received a copy of the GNU General Public License along
+ // with this library; see the file COPYING. If not, write to the Free
+ // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ // USA.
+
+ // As a special exception, you may use this file as part of a free software
+ // library without restriction. Specifically, if other files instantiate
+ // templates or use macros or inline functions from this file, or you compile
+ // this file and link it with other files to produce an executable, this
+ // file does not by itself cause the resulting executable to be covered by
+ // the GNU General Public License. This exception does not however
+ // invalidate any other reasons why the executable file might be covered by
+ // the GNU General Public License.
+
+ //
+ // ISO C++ 14882: 22.1 Locales
+ //
+
+ // Information as gleaned from /usr/include/ctype.h
+
+ ctype<char>::ctype(const mask* __table = 0, bool __del = false,
+ size_t __refs = 0)
+ : _Ctype_nois<char>(__refs), _M_del(__table != 0 && __del),
+ _M_toupper(NULL), _M_tolower(NULL),
+ _M_ctable(NULL), _M_table(__table == 0 ? (_ctype_ + 1) : __table)
+ { }
+
+ char
+ ctype<char>::do_toupper(char __c) const
+ { return ::toupper((int) __c); }
+
+ const char*
+ ctype<char>::do_toupper(char* __low, const char* __high) const
+ {
+ while (__low < __high)
+ {
+ *__low = ::toupper((int) *__low);
+ ++__low;
+ }
+ return __high;
+ }
+
+ char
+ ctype<char>::do_tolower(char __c) const
+ { return ::tolower((int) __c); }
+
+ const char*
+ ctype<char>::do_tolower(char* __low, const char* __high) const
+ {
+ while (__low < __high)
+ {
+ *__low = ::tolower((int) *__low);
+ ++__low;
+ }
+ return __high;
+ }
diff -Npr /tmp/empty/os_defines.h config/os/netbsd/bits/os_defines.h
*** /tmp/empty/os_defines.h Thu Jan 1 01:00:00 1970
--- config/os/netbsd/bits/os_defines.h Mon Nov 27 11:37:52 2000
***************
*** 0 ****
--- 1,47 ----
+ // Specific definitions for NetBSD -*- C++ -*-
+
+ // Copyright (C) 2000 Free Software Foundation, Inc.
+ //
+ // This file is part of the GNU ISO C++ Library. This library is free
+ // software; you can redistribute it and/or modify it under the
+ // terms of the GNU General Public License as published by the
+ // Free Software Foundation; either version 2, or (at your option)
+ // any later version.
+
+ // This library is distributed in the hope that it will be useful,
+ // but WITHOUT ANY WARRANTY; without even the implied warranty of
+ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ // GNU General Public License for more details.
+
+ // You should have received a copy of the GNU General Public License along
+ // with this library; see the file COPYING. If not, write to the Free
+ // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ // USA.
+
+ // As a special exception, you may use this file as part of a free software
+ // library without restriction. Specifically, if other files instantiate
+ // templates or use macros or inline functions from this file, or you compile
+ // this file and link it with other files to produce an executable, this
+ // file does not by itself cause the resulting executable to be covered by
+ // the GNU General Public License. This exception does not however
+ // invalidate any other reasons why the executable file might be covered by
+ // the GNU General Public License.
+
+
+ #ifndef _GLIBCPP_OS_DEFINES
+ # define _GLIBCPP_OS_DEFINES
+
+
+ /* Settings for NetBSD. */
+
+ /* __off_t is a typedef declared in stdio.h. */
+ /* #define __off_t off_t */
+
+ /* We don't have off64_t */
+ /* #define __off64_t off64_t */
+
+ #define __ssize_t ssize_t
+
+ #endif
+
+